Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f1acee5 authored by Michael Hennerich's avatar Michael Hennerich Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Acked-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e553f182

drivers/staging/iio/industrialio-core.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -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;