---

yaml --- r: 317375 b: refs/heads/master c: 2b8557a h: refs/heads/master i: 317373: 709a64a 317371: 21c6d6f 317367: c6d545e 317359: 54ccc7c 317343: 6df480a 317311: 88f0398 v: v3
git-mirror · Jun 15, 2012 · e1d92ae · e1d92ae
1 parent 11d9705
commit e1d92ae
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git 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
@@ -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++;