staging: comedi: adl_pci9118: TRIG_INT is not vaild for scan_begin_src
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 19 Oct 2015 20:12:56 +0000 (13:12 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Oct 2015 02:17:13 +0000 (19:17 -0700)
The (*do_cmdtest) in this driver validated the scan_begin_src as being
TRIG_FOLLOW | TRIG_TIMER | TRIG_EXT. The TRIG_INT source is not valid.

Remove the Step 2 mutual compatibility check that makes sure that TRIG_INT
is only used for the start_src or the scan_begin_src.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/adl_pci9118.c

index e5e0e1c4e50bc3728e979dd5955971b8a25d507a..a7c974423a3e6437ce086d62edd36631beb0a760 100644 (file)
@@ -1205,9 +1205,6 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
        if (cmd->start_src == TRIG_EXT && cmd->scan_begin_src == TRIG_EXT)
                err |= -EINVAL;
 
-       if (cmd->start_src == TRIG_INT && cmd->scan_begin_src == TRIG_INT)
-               err |= -EINVAL;
-
        if ((cmd->scan_begin_src & (TRIG_TIMER | TRIG_EXT)) &&
            (!(cmd->convert_src & (TRIG_TIMER | TRIG_NOW))))
                err |= -EINVAL;