From e1d92aeffa1ef1d5ab4a1f478d0b985fcd8d633a Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 13 Jun 2012 17:50:53 -0700
Subject: [PATCH] --- yaml --- r: 317375 b: refs/heads/master c:
 2b8557a734ab17d2cbb96a79bc267b30055e0ef3 h: refs/heads/master i:   317373:
 709a64a91c33664245f4937d4e60efc49554e19d   317371:
 21c6d6f79736c4e8dc7d6f01886a210d8d0ee1ce   317367:
 c6d545ec247507569ce1db5ea117058588ac4a95   317359:
 54ccc7ced0ed4efab0f827b31dd95625f88e10b6   317343:
 6df480a343d6d04a712d345999c65bc8dbcdf2ff   317311:
 88f0398b95f4fcba28b23b3ee5b98718954ac1b7 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/pcl816.c | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 52c064226b6c..d918bb4fbfd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 985eb50d553f4e2609778f999ecc5ec9837152f0
+refs/heads/master: 2b8557a734ab17d2cbb96a79bc267b30055e0ef3
diff --git a/trunk/drivers/staging/comedi/drivers/pcl816.c b/trunk/drivers/staging/comedi/drivers/pcl816.c
index c3ee6d69b9a6..ba6911f063cb 100644
--- a/trunk/drivers/staging/comedi/drivers/pcl816.c
+++ b/trunk/drivers/staging/comedi/drivers/pcl816.c
@@ -493,26 +493,11 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev,
 	 * are unique and mutually compatible
 	 */
 
-	if (cmd->start_src != TRIG_NOW) {
-		cmd->start_src = TRIG_NOW;
-		err++;
-	}
-
-	if (cmd->scan_begin_src != TRIG_FOLLOW) {
-		cmd->scan_begin_src = TRIG_FOLLOW;
-		err++;
-	}
-
 	if (cmd->convert_src != TRIG_EXT && cmd->convert_src != TRIG_TIMER) {
 		cmd->convert_src = TRIG_TIMER;
 		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++;