diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-09-21 06:16:02 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-26 20:31:56 -0400 |
commit | 30eb82f05dd1f12b18a0ad054401a0b5690fb3c3 (patch) | |
tree | 2970468c533272e6d840fb42ab3aff0636655040 /drivers/staging/iio/industrialio-core.c | |
parent | ad31d250bf60c8e4c990e8b0daeedbaa2d6884a9 (diff) |
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/industrialio-core.c')
-rw-r--r-- | drivers/staging/iio/industrialio-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index b11c7f303ac..647a4052a8c 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c | |||
@@ -1065,8 +1065,8 @@ static int iio_chrdev_open(struct inode *inode, struct file *filp) | |||
1065 | struct iio_dev *dev_info = container_of(inode->i_cdev, | 1065 | struct iio_dev *dev_info = container_of(inode->i_cdev, |
1066 | struct iio_dev, chrdev); | 1066 | struct iio_dev, chrdev); |
1067 | filp->private_data = dev_info; | 1067 | filp->private_data = dev_info; |
1068 | iio_chrdev_buffer_open(dev_info); | 1068 | |
1069 | return 0; | 1069 | return iio_chrdev_buffer_open(dev_info); |
1070 | } | 1070 | } |
1071 | 1071 | ||
1072 | /** | 1072 | /** |