Skip to content

Commit

Permalink
staging: iio: core: Avoid NULL pointer de-ref in case indio_dev->setu…
Browse files Browse the repository at this point in the history
…p_ops are not in use

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>
  • Loading branch information
mhennerich authored and gregkh committed Mar 3, 2012
1 parent e553f18 commit 0f1acee
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/staging/iio/industrialio-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,8 @@ static const struct file_operations iio_buffer_fileops = {
.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 ret;
Expand Down Expand Up @@ -882,6 +884,10 @@ int iio_device_register(struct iio_dev *indio_dev)
if (indio_dev->modes & INDIO_BUFFER_TRIGGERED)
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);
if (ret < 0)
goto error_unreg_eventset;
Expand Down

0 comments on commit 0f1acee

Please sign in to comment.