]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
staging: comedi: usbduxsigma: check for invalid 'ao_timer' in all cases
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Thu, 23 May 2013 20:05:59 +0000 (13:05 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 May 2013 11:41:08 +0000 (20:41 +0900)
Make sure to check that the 'ao_timer' value is valid for both the
high speed and low speed cases in usbduxsigma_ao_cmdtest().

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/usbduxsigma.c

index ed5085a70807bc061453db17aa9364c9a30f8588..aa0090c55f60b9fabb2f8839f9be5b66c8565fcd 100644 (file)
@@ -994,9 +994,9 @@ static int usbduxsigma_ao_cmdtest(struct comedi_device *dev,
                 * we get all channels at once
                 */
                devpriv->ao_timer = cmd->scan_begin_arg / 1000000;
-               if (devpriv->ao_timer < 1)
-                       err |= -EINVAL;
        }
+       if (devpriv->ao_timer < 1)
+               err |= -EINVAL;
 
        if (cmd->stop_src == TRIG_COUNT) {
                /* not continuous, use counter */