projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e553f18
)
staging: iio: core: Avoid NULL pointer de-ref in case indio_dev->setup_ops are not...
author
Michael Hennerich
<
[email protected]
>
Thu, 1 Mar 2012 09:51:04 +0000
(10:51 +0100)
committer
Greg Kroah-Hartman
<
[email protected]
>
Sat, 3 Mar 2012 00:35:39 +0000
(16:35 -0800)
Drivers may not need setup_ops at all, so let the core supply
some empty ops.
Signed-off-by: Michael Hennerich <
[email protected]
>
Acked-by: Jonathan Cameron <
[email protected]
>
Signed-off-by: Greg Kroah-Hartman <
[email protected]
>
drivers/staging/iio/industrialio-core.c
patch
|
blob
|
history
diff --git
a/drivers/staging/iio/industrialio-core.c
b/drivers/staging/iio/industrialio-core.c
index 868e36672001c7b7a437a846835a056b8f1b3f23..27695dffb17786fe0730e882b8f3ad714014b36e 100644
(file)
--- a/
drivers/staging/iio/industrialio-core.c
+++ b/
drivers/staging/iio/industrialio-core.c
@@
-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;
@@
-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;