From 51be8f529fd755335a4b5e9cf528b1fbb9b316a3 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 11 Sep 2012 15:09:23 -0700
Subject: [PATCH] --- yaml --- r: 325212 b: refs/heads/master c:
 85f3088b848900a1c904dde2ae6505ecad399910 h: refs/heads/master v: v3

---
 [refs]                                             |  2 +-
 trunk/drivers/staging/comedi/drivers/adv_pci1710.c | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 2a2c294a607b..275b991cc4cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8531fce9450bcb7bc0947d818c05644339b88a48
+refs/heads/master: 85f3088b848900a1c904dde2ae6505ecad399910
diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
index 379a7134230a..6fbf566d84a1 100644
--- a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1064,19 +1064,9 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
 		err++;
 	}
 
-	if (cmd->scan_begin_src != TRIG_FOLLOW) {
-		cmd->scan_begin_src = TRIG_FOLLOW;
-		err++;
-	}
-
 	if (cmd->convert_src != TRIG_TIMER && cmd->convert_src != TRIG_EXT)
 		err++;
 
-	if (cmd->scan_end_src != TRIG_COUNT) {
-		cmd->scan_end_src = TRIG_COUNT;
-		err++;
-	}
-
 	if (cmd->stop_src != TRIG_NONE && cmd->stop_src != TRIG_COUNT)
 		err++;