evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: drivers (core): don't BUG_ON due to faulty drivers

Browse source 
The postconfig for drivers that support async commands currently can
BUG_ON if the subdevice was improperly configured by the driver.

Change the BUG_ON so that a dev_warn() is output and the postconfig
returns -EINVAL. This will prevent the comedi core from attaching to
the faulty driver but does not BUG the kernel.

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 2013-01-21 14:37:15 -07:00 • committed by Greg Kroah-Hartman
parent 40f58a65c9
commit 57b71c3e6f
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/staging/comedi/drivers.c
View file

@ -178,8 +178,16 @@ static int __comedi_device_postconfig_async(struct comedi_device *dev,
unsigned int buf_size; unsigned int buf_size;
int ret; int ret;
BUG_ON((s->subdev_flags & (SDF_CMD_READ | SDF_CMD_WRITE)) == 0); if ((s->subdev_flags & (SDF_CMD_READ | SDF_CMD_WRITE)) == 0) {
BUG_ON(!s->do_cmdtest); dev_warn(dev->class_dev,
"async subdevices must support SDF_CMD_READ or SDF_CMD_WRITE\n");
return -EINVAL;
}
if (!s->do_cmdtest) {
dev_warn(dev->class_dev,
"async subdevices must have a do_cmdtest() function\n");
return -EINVAL;
}
async = kzalloc(sizeof(*async), GFP_KERNEL); async = kzalloc(sizeof(*async), GFP_KERNEL);
if (!async) { if (!async) {