diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-09-21 11:16:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-26 17:31:56 -0700 |
| commit | 30eb82f05dd1f12b18a0ad054401a0b5690fb3c3 (patch) | |
| tree | 2970468c533272e6d840fb42ab3aff0636655040 /drivers/staging/iio/iio_core.h | |
| parent | ad31d250bf60c8e4c990e8b0daeedbaa2d6884a9 (diff) | |
| download | op-kernel-dev-30eb82f05dd1f12b18a0ad054401a0b5690fb3c3.zip op-kernel-dev-30eb82f05dd1f12b18a0ad054401a0b5690fb3c3.tar.gz | |
staging:iio: Prevent reading from buffer chrdev when device has no buffer.
Silly bug introduced during the chrdev merge series.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/iio_core.h')
| -rw-r--r-- | drivers/staging/iio/iio_core.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/staging/iio/iio_core.h b/drivers/staging/iio/iio_core.h index dde9e3e..36159e0 100644 --- a/drivers/staging/iio/iio_core.h +++ b/drivers/staging/iio/iio_core.h @@ -33,7 +33,7 @@ int __iio_add_chan_devattr(const char *postfix, #ifdef CONFIG_IIO_BUFFER struct poll_table_struct; -void iio_chrdev_buffer_open(struct iio_dev *indio_dev); +int iio_chrdev_buffer_open(struct iio_dev *indio_dev); void iio_chrdev_buffer_release(struct iio_dev *indio_dev); unsigned int iio_buffer_poll(struct file *filp, @@ -47,8 +47,11 @@ ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf, #else -static inline void iio_chrdev_buffer_open(struct iio_dev *indio_dev) -{} +static inline int iio_chrdev_buffer_open(struct iio_dev *indio_dev) +{ + return -EINVAL; +} + static inline void iio_chrdev_buffer_release(struct iio_dev *indio_dev) {} |
