From ce5032096cb23601db91e9fd27629413f82cef10 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 11 Sep 2012 10:48:47 -0700
Subject: [PATCH] --- yaml --- r: 325155 b: refs/heads/master c:
 499a76dc830d32fa8a0c56360b89d4596789f85e h: refs/heads/master i:   325153:
 e8bc12354bff78b2c7f44e922d37a1121c1be54d   325151:
 ee40a1ffa830549f7fbdc301abe4757d1ff4e387 v: v3

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

diff --git a/[refs] b/[refs]
index 181bdb379d46..675ed69aeead 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e990333d11d8d37d802c8c2f22acf1b0461bd7c9
+refs/heads/master: 499a76dc830d32fa8a0c56360b89d4596789f85e
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
index 7f7efe144327..44b01f4b07e6 100644
--- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -443,7 +443,7 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev,
 		i8253_cascade_ns_to_timer_2div(PCI9111_8254_CLOCK_PERIOD_NS,
 					       &dev_private->div1,
 					       &dev_private->div2,
-					       &(cmd->convert_arg),
+					       &cmd->convert_arg,
 					       cmd->flags & TRIG_ROUND_MASK);
 		if (tmp != cmd->convert_arg)
 			error++;
@@ -571,13 +571,6 @@ static int pci9111_ai_do_cmd(struct comedi_device *dev,
 	dev_private->scan_delay = 0;
 	switch (async_cmd->convert_src) {
 	case TRIG_TIMER:
-		i8253_cascade_ns_to_timer_2div(PCI9111_8254_CLOCK_PERIOD_NS,
-					       &dev_private->div1,
-					       &dev_private->div2,
-					       &(async_cmd->convert_arg),
-					       async_cmd->
-					       flags & TRIG_ROUND_MASK);
-
 		pci9111_trigger_source_set(dev, software);
 		pci9111_timer_set(dev);
 		pci9111_fifo_reset(dev);