From 36b117628f9b940a571e040267ba38e9af4b2a5b Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 18 Jun 2010 12:11:28 +0100
Subject: [PATCH] --- yaml --- r: 200695 b: refs/heads/master c:
 6c2fd308045ba902fbe9f4408daa7b949fa8f5a1 h: refs/heads/master i:   200693:
 629ca4fd03f9ffd9c28a5839ffd1885e137c0fa5   200691:
 75f84619fdd2fce77d1a1561695585dfdc19c16f   200687:
 1940b19e95f7f84fcd97bd5cdcfd43b88de86982 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/comedi/drivers/adl_pci9111.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1a6f81e563a5..d77a77e73869 100644
--- 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
index 36a254cd4413..39d112b708e3 100644
--- 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;