iio: imu: kmx61: Use correct base when reading data
authorDaniel Baluta <daniel.baluta@intel.com>
Tue, 23 Dec 2014 13:22:33 +0000 (15:22 +0200)
committerJonathan Cameron <jic23@kernel.org>
Mon, 5 Jan 2015 18:59:55 +0000 (18:59 +0000)
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>
drivers/iio/imu/kmx61.c

index 1f7c3f1f4dfddb8d9a7b522a4502aa2d245b45e1..b60b22d25615d9cfcad6f2ca865c7c00b16ea90e 100644 (file)
@@ -1218,12 +1218,18 @@ static irqreturn_t kmx61_trigger_handler(int irq, void *p)
        struct iio_dev *indio_dev = pf->indio_dev;
        struct kmx61_data *data = kmx61_get_data(indio_dev);
        int bit, ret, i = 0;
+       u8 base;
        s16 buffer[8];
 
+       if (indio_dev == data->acc_indio_dev)
+               base = KMX61_ACC_XOUT_L;
+       else
+               base = KMX61_MAG_XOUT_L;
+
        mutex_lock(&data->lock);
        for_each_set_bit(bit, indio_dev->buffer->scan_mask,
                         indio_dev->masklength) {
-               ret = kmx61_read_measurement(data, KMX61_ACC_XOUT_L, bit);
+               ret = kmx61_read_measurement(data, base, bit);
                if (ret < 0) {
                        mutex_unlock(&data->lock);
                        goto err;