diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-23 13:24:10 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-23 13:24:10 -0700 |
commit | dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5 (patch) | |
tree | 1926c96f145965c393a2c8ab523c327dd1a241cf /drivers/iio/iio_core.h | |
parent | c8f2efc8f636506e0f0c2ba4035382076875f0c1 (diff) | |
parent | 9d23108df359e572a0dca0b631bfee9f5e0fa9ea (diff) | |
download | lwn-dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5.tar.gz lwn-dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5.zip |
Merge branch 'master' into usb-next
We have USB fixes now in Linus's tree that we need to properly sort out
with reverts and the like in the usb-next branch, so merge them together
and do it by hand.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/iio_core.h')
-rw-r--r-- | drivers/iio/iio_core.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/iio/iio_core.h b/drivers/iio/iio_core.h index 05c1b74502a3..9b32253b824b 100644 --- a/drivers/iio/iio_core.h +++ b/drivers/iio/iio_core.h @@ -49,11 +49,15 @@ ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf, #define iio_buffer_poll_addr (&iio_buffer_poll) #define iio_buffer_read_first_n_outer_addr (&iio_buffer_read_first_n_outer) +void iio_disable_all_buffers(struct iio_dev *indio_dev); + #else #define iio_buffer_poll_addr NULL #define iio_buffer_read_first_n_outer_addr NULL +static inline void iio_disable_all_buffers(struct iio_dev *indio_dev) {} + #endif int iio_device_register_eventset(struct iio_dev *indio_dev); |