---

yaml --- r: 200695 b: refs/heads/master c: 6c2fd30 h: refs/heads/master i: 200693: 629ca4f 200691: 75f8461 200687: 1940b19 v: v3
git-mirror · Jun 30, 2010 · 36b1176 · 36b1176
1 parent da01bb2
commit 36b1176
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44176d9f8265de799512f833ca4d9785aa016b3a
+refs/heads/master: 6c2fd308045ba902fbe9f4408daa7b949fa8f5a1
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -824,9 +824,12 @@ static int pci9111_ai_do_cmd(struct comedi_device *dev,
 		plx9050_interrupt_control(dev_private->lcr_io_base, true, true,
 					  false, true, true);
 
-		dev_private->scan_delay =
-		    (async_cmd->scan_begin_arg / (async_cmd->convert_arg *
-						  async_cmd->chanlist_len)) - 1;
+		if (async_cmd->scan_begin_src == TRIG_TIMER) {
+			dev_private->scan_delay =
+				(async_cmd->scan_begin_arg /
+				 (async_cmd->convert_arg *
+				  async_cmd->chanlist_len)) - 1;
+		}
 
 		break;