summaryrefslogtreecommitdiffstats
path: root/drivers/iio/gyro
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-07 11:03:02 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-07 11:03:02 +0200
commitc610f7f772aa06ae2bd8e5ace87cde4d90f70198 (patch)
tree6991a32acd3d63685c184734869877707fa73d1c /drivers/iio/gyro
parentf9541f8239a5765595543b021b2dce6a8d6653ab (diff)
parentf22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff)
downloadop-kernel-dev-c610f7f772aa06ae2bd8e5ace87cde4d90f70198.zip
op-kernel-dev-c610f7f772aa06ae2bd8e5ace87cde4d90f70198.tar.gz
Merge 4.0-rc7 into staging-next
We want those fixes (iio primarily) into the -next branch to help with merge and testing issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/gyro')
-rw-r--r--drivers/iio/gyro/bmg160.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c
index 56d68e1..4415f55 100644
--- a/drivers/iio/gyro/bmg160.c
+++ b/drivers/iio/gyro/bmg160.c
@@ -822,7 +822,7 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p)
int bit, ret, i = 0;
mutex_lock(&data->mutex);
- for_each_set_bit(bit, indio_dev->buffer->scan_mask,
+ for_each_set_bit(bit, indio_dev->active_scan_mask,
indio_dev->masklength) {
ret = i2c_smbus_read_word_data(data->client,
BMG160_AXIS_TO_REG(bit));
OpenPOWER on IntegriCloud