diff --git a/[refs] b/[refs]
index a92f4c1512f0..963e402f74da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61283d227c6b39e30afc6346db099521b0b64fa1
+refs/heads/master: 8f87b832dea11dd00f6a30aaaf934c5c93556cfe
diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
index 82433864094f..394d2ea19c2e 100644
--- a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1035,14 +1035,6 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
 		}
 	}
 
-	if (!cmd->chanlist_len) {
-		cmd->chanlist_len = 1;
-		err++;
-	}
-	if (cmd->chanlist_len > this_board->n_aichan) {
-		cmd->chanlist_len = this_board->n_aichan;
-		err++;
-	}
 	if (cmd->scan_end_arg != cmd->chanlist_len) {
 		cmd->scan_end_arg = cmd->chanlist_len;
 		err++;