]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: adl_pci9118: TRIG_INT is not a valid scan_begin_src
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Sep 2014 20:05:48 +0000 (13:05 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Sep 2014 21:34:25 +0000 (14:34 -0700)
The (*do_cmdtest) validates the scan_begin_src as TRIG_FOLLOW, TRIG_TIMER,
or TRIG_EXT. Remove the invalid check for TRIG_INT in the (*do_cmd).

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 86c8b66ba9eb54bd030e1bb2f76b7f68f4c23e4f..98922d735f007d367d19bf0793d520880abc6ce4 100644 (file)
@@ -1328,8 +1328,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         * channel manipulation without timers effect
         */
        if (((cmd->scan_begin_src == TRIG_FOLLOW) ||
-               (cmd->scan_begin_src == TRIG_EXT) ||
-               (cmd->scan_begin_src == TRIG_INT)) &&
+               (cmd->scan_begin_src == TRIG_EXT)) &&
                (cmd->convert_src == TRIG_TIMER)) {
                                        /* both timer is used for one time */
                if (cmd->scan_begin_src == TRIG_EXT)