aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-09-11 18:09:23 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-12 12:29:22 -0400
commit85f3088b848900a1c904dde2ae6505ecad399910 (patch)
tree0a2d688664aa5a6c67e2c4c4901e28a027de1081
parent8531fce9450bcb7bc0947d818c05644339b88a48 (diff)
staging: comedi: adv_pci1710: single source triggers are unique
If a single source trigger passes "step 1" of the do_cmdtest function they are already unique. There is no need to recheck them. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/adv_pci1710.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 379a7134230a..6fbf566d84a1 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1064,19 +1064,9 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
1064 err++; 1064 err++;
1065 } 1065 }
1066 1066
1067 if (cmd->scan_begin_src != TRIG_FOLLOW) {
1068 cmd->scan_begin_src = TRIG_FOLLOW;
1069 err++;
1070 }
1071
1072 if (cmd->convert_src != TRIG_TIMER && cmd->convert_src != TRIG_EXT) 1067 if (cmd->convert_src != TRIG_TIMER && cmd->convert_src != TRIG_EXT)
1073 err++; 1068 err++;
1074 1069
1075 if (cmd->scan_end_src != TRIG_COUNT) {
1076 cmd->scan_end_src = TRIG_COUNT;
1077 err++;
1078 }
1079
1080 if (cmd->stop_src != TRIG_NONE && cmd->stop_src != TRIG_COUNT) 1070 if (cmd->stop_src != TRIG_NONE && cmd->stop_src != TRIG_COUNT)
1081 err++; 1071 err++;
1082 1072