From cee0aa52f53cbfcd1de73c81bae2c61a080fa3f5 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 11 Sep 2012 15:09:39 -0700
Subject: [PATCH] --- yaml --- r: 325213 b: refs/heads/master c:
 b7f16de6a4fc15b07d0ec86fdc78b1093dd07f52 h: refs/heads/master i:   325211:
 bc152a70df5e9db6daac311e865097d9a144b206 v: v3

---
 [refs]                                            |  2 +-
 .../drivers/staging/comedi/drivers/adv_pci1710.c  | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 275b991cc4cf..03a0de967cdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85f3088b848900a1c904dde2ae6505ecad399910
+refs/heads/master: b7f16de6a4fc15b07d0ec86fdc78b1093dd07f52
diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
index 6fbf566d84a1..0fd0210625f6 100644
--- a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1057,18 +1057,13 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
 	if (err)
 		return 1;
 
-	/* step2: make sure trigger srcs are unique and mutually compatible */
+	/* step 2a: make sure trigger sources are unique */
 
-	if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT) {
-		cmd->start_src = TRIG_NOW;
-		err++;
-	}
+	err |= cfc_check_trigger_is_unique(cmd->start_src);
+	err |= cfc_check_trigger_is_unique(cmd->convert_src);
+	err |= cfc_check_trigger_is_unique(cmd->stop_src);
 
-	if (cmd->convert_src != TRIG_TIMER && cmd->convert_src != TRIG_EXT)
-		err++;
-
-	if (cmd->stop_src != TRIG_NONE && cmd->stop_src != TRIG_COUNT)
-		err++;
+	/* step 2b: and mutually compatible */
 
 	if (err)
 		return 2;