From 87b0badd5acffe08383a3c38d81258fe00b358c7 Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Thu, 1 Mar 2012 10:51:04 +0100 Subject: [PATCH] --- yaml --- r: 289177 b: refs/heads/master c: 0f1acee5f5e2ceaef3244dc4c1f3895b907669cd h: refs/heads/master i: 289175: 81ef36275ff09fcc1c146458ff8386a455f05707 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/industrialio-core.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b87e5dfe7502..2d52869d86fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e553f182d55bd268fea3f106368e2344141c212a +refs/heads/master: 0f1acee5f5e2ceaef3244dc4c1f3895b907669cd diff --git a/trunk/drivers/staging/iio/industrialio-core.c b/trunk/drivers/staging/iio/industrialio-core.c index 868e36672001..27695dffb177 100644 --- a/trunk/drivers/staging/iio/industrialio-core.c +++ b/trunk/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;