leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Remove the unnecessary check of 'cmd->chanlist_len > 0'. The (*do_cmdtest) already
validated this before the (*do_cmd) was called.

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>
This commit is contained in:
H Hartley Sweeten 2014-02-10 15:20:29 -07:00 committed by Greg Kroah-Hartman
parent dbd446fc7a
commit a5e99e126b
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/staging/comedi/drivers/usbduxfast.c
View File

@ -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;