staging: comedi: adl_pci9111: single source triggers are unique
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 11 Sep 2012 17:47:52 +0000 (10:47 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Sep 2012 19:11:04 +0000 (12:11 -0700)
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>
drivers/staging/comedi/drivers/adl_pci9111.c

index ebd819ef967ee1a5867905316edc6d91c51a9e5f..152d682913c8d1decd074d3ea941fdea22b775bb 100644 (file)
@@ -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++;