diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-07-17 16:59:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-07 14:30:26 -0700 |
| commit | 46e8c10748ae262b4c78800f73db4dd9d4ef04ee (patch) | |
| tree | 3e8fd9210621995ec808e435d3523246c60e0399 | |
| parent | d20b1088e2ed58eeab3b440e30a20b01afc48590 (diff) | |
| download | linux-3.10-46e8c10748ae262b4c78800f73db4dd9d4ef04ee.tar.gz linux-3.10-46e8c10748ae262b4c78800f73db4dd9d4ef04ee.tar.bz2 linux-3.10-46e8c10748ae262b4c78800f73db4dd9d4ef04ee.zip | |
iio: buffer: Fix demux table creation
commit 61bd55ce1667809f022be88da77db17add90ea4e upstream.
When creating the demux table we need to iterate over the selected scan mask for
the buffer to get the samples which should be copied to destination buffer.
Right now the code uses the mask which contains all active channels, which means
the demux table contains entries which causes it to copy all the samples from
source to destination buffer one by one without doing any demuxing.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/iio/industrialio-buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index d344cf3ac9e..e13c5f4b12c 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -849,7 +849,7 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev, /* Now we have the two masks, work from least sig and build up sizes */ for_each_set_bit(out_ind, - indio_dev->active_scan_mask, + buffer->scan_mask, indio_dev->masklength) { in_ind = find_next_bit(indio_dev->active_scan_mask, indio_dev->masklength, |