From 52ee03f40db06c06dbef5bd44a7e89026cee5520 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 13 Nov 2012 17:57:27 -0700
Subject: [PATCH] --- yaml --- r: 337926 b: refs/heads/master c:
 aadd0132c5ac794415690b5ef95fd4da986fec78 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/ni_tiocmd.c        | 40 +++++--------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index deb8d94cd772..cd88695fca9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 616a14d7adfb2ee9bec6209500be6399771a2816
+refs/heads/master: aadd0132c5ac794415690b5ef95fd4da986fec78
diff --git a/trunk/drivers/staging/comedi/drivers/ni_tiocmd.c b/trunk/drivers/staging/comedi/drivers/ni_tiocmd.c
index 11a377a6c27c..0c991b99da13 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_tiocmd.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_tiocmd.c
@@ -275,37 +275,19 @@ int ni_tio_cmdtest(struct ni_gpct *counter, struct comedi_cmd *cmd)
 	if (err)
 		return 2;
 
-	/* step 3: make sure arguments are trivially compatible */
-	if (cmd->start_src != TRIG_EXT) {
-		if (cmd->start_arg != 0) {
-			cmd->start_arg = 0;
-			err++;
-		}
-	}
-	if (cmd->scan_begin_src != TRIG_EXT) {
-		if (cmd->scan_begin_arg) {
-			cmd->scan_begin_arg = 0;
-			err++;
-		}
-	}
-	if (cmd->convert_src != TRIG_EXT) {
-		if (cmd->convert_arg) {
-			cmd->convert_arg = 0;
-			err++;
-		}
-	}
+	/* Step 3: check if arguments are trivially valid */
 
-	if (cmd->scan_end_arg != cmd->chanlist_len) {
-		cmd->scan_end_arg = cmd->chanlist_len;
-		err++;
-	}
+	if (cmd->start_src != TRIG_EXT)
+		err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-	if (cmd->stop_src == TRIG_NONE) {
-		if (cmd->stop_arg != 0) {
-			cmd->stop_arg = 0;
-			err++;
-		}
-	}
+	if (cmd->scan_begin_src != TRIG_EXT)
+		err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+
+	if (cmd->convert_src != TRIG_EXT)
+		err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+
+	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+	err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
 	if (err)
 		return 3;