summaryrefslogtreecommitdiffstats
path: root/drivers/iio/industrialio-buffer.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2012-07-02 14:52:56 +0200
committerJonathan Cameron <jic23@kernel.org>2012-07-08 20:02:23 +0100
commite1dc7bee745f74b42685b4b0b0a24895966e545e (patch)
treeac17495a44a52a3197f8cba56d80b611cd78e732 /drivers/iio/industrialio-buffer.c
parent0932966b1ca03217c6e0c18375867b1a99ee5af0 (diff)
downloadblackbird-op-linux-e1dc7bee745f74b42685b4b0b0a24895966e545e.tar.gz
blackbird-op-linux-e1dc7bee745f74b42685b4b0b0a24895966e545e.zip
iio: iio_buffer_register: Use correct channel when calculating masklength
The channel set assigned to the iio device is not necessarily the same has the channel set passed to iio_buffer_register. So to avoid possible complications always work with the channel set pass to iio_buffer_register and ignore the channel set assigned to the iio device. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/industrialio-buffer.c')
-rw-r--r--drivers/iio/industrialio-buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 3d8d187eef2a..096a6bfe0cdf 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -292,7 +292,7 @@ int iio_buffer_register(struct iio_dev *indio_dev,
if (channels[i].scan_index >
(int)indio_dev->masklength - 1)
indio_dev->masklength
- = indio_dev->channels[i].scan_index + 1;
+ = channels[i].scan_index + 1;
ret = iio_buffer_add_channel_sysfs(indio_dev,
&channels[i]);
OpenPOWER on IntegriCloud