Commit a5e99e12 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: usbduxfast: 'cmd->chanlist_len' was already validataed

Remove the unnecessary check of 'cmd->chanlist_len > 0'. The (*do_cmdtest) already
validated this before the (*do_cmd) was called.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dbd446fc
...@@ -514,27 +514,25 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, ...@@ -514,27 +514,25 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
*/ */
devpriv->ignore = PACKETS_TO_IGNORE; devpriv->ignore = PACKETS_TO_IGNORE;
if (cmd->chanlist_len > 0) { gain = CR_RANGE(cmd->chanlist[0]);
gain = CR_RANGE(cmd->chanlist[0]); for (i = 0; i < cmd->chanlist_len; ++i) {
for (i = 0; i < cmd->chanlist_len; ++i) { chan = CR_CHAN(cmd->chanlist[i]);
chan = CR_CHAN(cmd->chanlist[i]); if (chan != i) {
if (chan != i) { dev_err(dev->class_dev,
dev_err(dev->class_dev, "channels are not consecutive\n");
"channels are not consecutive\n"); up(&devpriv->sem);
up(&devpriv->sem); return -EINVAL;
return -EINVAL; }
} if ((gain != CR_RANGE(cmd->chanlist[i]))
if ((gain != CR_RANGE(cmd->chanlist[i])) && (cmd->chanlist_len > 3)) {
&& (cmd->chanlist_len > 3)) { dev_err(dev->class_dev,
dev_err(dev->class_dev, "gain must be the same for all channels\n");
"gain must be the same for all channels\n"); up(&devpriv->sem);
up(&devpriv->sem); return -EINVAL;
return -EINVAL; }
} if (i >= NUMCHANNELS) {
if (i >= NUMCHANNELS) { dev_err(dev->class_dev, "chanlist too long\n");
dev_err(dev->class_dev, "chanlist too long\n"); break;
break;
}
} }
} }
steps = 0; steps = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment