Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 01:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: iio: core: Avoid NULL pointer de-ref in case indio_dev->setup_ops are not in use

Browse Source 
Drivers may not need setup_ops at all, so let the core supply
some empty ops.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Hennerich 2012-03-01 10:51:04 +01:00 committed by Greg Kroah-Hartman
parent e553f182d5
commit 0f1acee5f5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/iio/industrialio-core.c
View File

@ -854,6 +854,8 @@ static const struct file_operations iio_buffer_fileops = {
.compat_ioctl = iio_ioctl, .compat_ioctl = iio_ioctl,
}; };
static const struct iio_buffer_setup_ops noop_ring_setup_ops;
int iio_device_register(struct iio_dev *indio_dev) int iio_device_register(struct iio_dev *indio_dev)
{ {
int ret; int ret;
@ -882,6 +884,10 @@ int iio_device_register(struct iio_dev *indio_dev)
if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) if (indio_dev->modes & INDIO_BUFFER_TRIGGERED)
iio_device_register_trigger_consumer(indio_dev); iio_device_register_trigger_consumer(indio_dev);
if ((indio_dev->modes & INDIO_ALL_BUFFER_MODES) &&
indio_dev->setup_ops == NULL)
indio_dev->setup_ops = &noop_ring_setup_ops;
ret = device_add(&indio_dev->dev); ret = device_add(&indio_dev->dev);
if (ret < 0) if (ret < 0)
goto error_unreg_eventset; goto error_unreg_eventset;