diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-11 10:47:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-11 12:11:04 -0700 |
| commit | 6be4173b02f85fa3d2f8610b79ea276eea86c3ac (patch) | |
| tree | 28a67fbac3b0a83361200013d38d955ff148ccbf | |
| parent | 97e01bb10a193b1d8592303d8858192ee9ea32f7 (diff) | |
staging: comedi: adl_pci9111: 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/adl_pci9111.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index ebd819ef967e..152d682913c8 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c @@ -369,9 +369,6 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev, /* step 2 : make sure trigger sources are unique and mutually * compatible */ - if (cmd->start_src != TRIG_NOW) - error++; - if ((cmd->scan_begin_src != TRIG_TIMER) && (cmd->scan_begin_src != TRIG_FOLLOW) && (cmd->scan_begin_src != TRIG_EXT)) @@ -388,9 +385,6 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev, (cmd->scan_begin_src == TRIG_FOLLOW))) error++; - - if (cmd->scan_end_src != TRIG_COUNT) - error++; if ((cmd->stop_src != TRIG_COUNT) && (cmd->stop_src != TRIG_NONE)) error++; |
