shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: usbduxfast: only chanlist of 1, 2, 3, or 16 are supported

Browse Source 
The analog input (*do_cmd) only supports channel lists of 1, 2, 3, or 16
channels. Add a check for this to usbduxfast_ai_check_chanlist() and remove
the check from usbduxfast_ai_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>
This commit is contained in:
H Hartley Sweeten
2015-08-24 10:13:55 -07:00
committed by Greg Kroah-Hartman
parent 99555fc25a
commit db1876ff1e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -339,6 +339,11 @@ static int usbduxfast_ai_check_chanlist(struct comedi_device *dev,
unsigned int gain0 = CR_RANGE(cmd->chanlist[0]);
int i;
if (cmd->chanlist_len > 3 && cmd->chanlist_len != 16) {
dev_err(dev->class_dev, "unsupported combination of channels\n");
return -EINVAL;
}
for (i = 0; i < cmd->chanlist_len; ++i) {
unsigned int chan = CR_CHAN(cmd->chanlist[i]);
unsigned int gain = CR_RANGE(cmd->chanlist[i]);
@@ -779,11 +784,6 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
usbduxfast_cmd_data(dev, 4, 0x09, 0x01, rngmask, 0xff);
break;
default:
dev_err(dev->class_dev, "unsupported combination of channels\n");
up(&devpriv->sem);
return -EFAULT;
}
/* 0 means that the AD commands are sent */