diff --git a/[refs] b/[refs]
index 30cd31eee95f..a73554a8aea7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48c8276d7ac534d62c594c9a493130ff9137675d
+refs/heads/master: 7ff177a88782461893316a512e75a3f169fbae8b
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
index 9b53255bd45b..010697fa2936 100644
--- a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -2669,7 +2669,7 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_s
 			err++;
 			printk("\nThe Delay time base selection is in error\n");
 		}
-		if (ui_DelayTime < 1 && ui_DelayTime > 1023) {
+		if (ui_DelayTime < 1 || ui_DelayTime > 1023) {
 			err++;
 			printk("\nThe Delay time value is in error\n");
 		}