diff options
author | Daniel Baluta <daniel.baluta@intel.com> | 2014-12-23 08:22:33 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2015-01-05 13:59:55 -0500 |
commit | 6a191c7025f80c328156a358871f5d947f443aa9 (patch) | |
tree | ff908b36bfddb3366f09f0121e916c6d175722bb | |
parent | ea04d2965874ca5753e756b335449c5322a85733 (diff) |
iio: imu: kmx61: Use correct base when reading data
We have two IIO devices and we need to adjust the base
when reading data.
Signed-off-by: Daniel Baluta <daniel.baluta@intel.com>
Reviewed-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r-- | drivers/iio/imu/kmx61.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c index 1f7c3f1f4dfd..b60b22d25615 100644 --- a/drivers/iio/imu/kmx61.c +++ b/drivers/iio/imu/kmx61.c | |||
@@ -1218,12 +1218,18 @@ static irqreturn_t kmx61_trigger_handler(int irq, void *p) | |||
1218 | struct iio_dev *indio_dev = pf->indio_dev; | 1218 | struct iio_dev *indio_dev = pf->indio_dev; |
1219 | struct kmx61_data *data = kmx61_get_data(indio_dev); | 1219 | struct kmx61_data *data = kmx61_get_data(indio_dev); |
1220 | int bit, ret, i = 0; | 1220 | int bit, ret, i = 0; |
1221 | u8 base; | ||
1221 | s16 buffer[8]; | 1222 | s16 buffer[8]; |
1222 | 1223 | ||
1224 | if (indio_dev == data->acc_indio_dev) | ||
1225 | base = KMX61_ACC_XOUT_L; | ||
1226 | else | ||
1227 | base = KMX61_MAG_XOUT_L; | ||
1228 | |||
1223 | mutex_lock(&data->lock); | 1229 | mutex_lock(&data->lock); |
1224 | for_each_set_bit(bit, indio_dev->buffer->scan_mask, | 1230 | for_each_set_bit(bit, indio_dev->buffer->scan_mask, |
1225 | indio_dev->masklength) { | 1231 | indio_dev->masklength) { |
1226 | ret = kmx61_read_measurement(data, KMX61_ACC_XOUT_L, bit); | 1232 | ret = kmx61_read_measurement(data, base, bit); |
1227 | if (ret < 0) { | 1233 | if (ret < 0) { |
1228 | mutex_unlock(&data->lock); | 1234 | mutex_unlock(&data->lock); |
1229 | goto err; | 1235 | goto err; |