Merge tag 'iio-for-4.11b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[mirror_ubuntu-bionic-kernel.git] / drivers / iio / imu / bmi160 / bmi160_core.c

diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c
index c9e319bff58b314f626797f9dbf36339eb76be04..cfd225ed1c8da57b7a7726ff32aca80e8cb70e1a 100644 (file)
--- a/drivers/iio/imu/bmi160/bmi160_core.c
+++ b/drivers/iio/imu/bmi160/bmi160_core.c
@@ -325,9 +325,9 @@ static int bmi160_get_data(struct bmi160_data *data, int chan_type,
        __le16 sample;
        enum bmi160_sensor_type t = bmi160_to_sensor(chan_type);
 
-       reg = bmi160_regs[t].data + (axis - IIO_MOD_X) * sizeof(__le16);
+       reg = bmi160_regs[t].data + (axis - IIO_MOD_X) * sizeof(sample);
 
-       ret = regmap_bulk_read(data->regmap, reg, &sample, sizeof(__le16));
+       ret = regmap_bulk_read(data->regmap, reg, &sample, sizeof(sample));
        if (ret < 0)
                return ret;
 
@@ -392,8 +392,8 @@ static irqreturn_t bmi160_trigger_handler(int irq, void *p)
 
        for_each_set_bit(i, indio_dev->active_scan_mask,
                         indio_dev->masklength) {
-               ret = regmap_bulk_read(data->regmap, base + i * sizeof(__le16),
-                                      &sample, sizeof(__le16));
+               ret = regmap_bulk_read(data->regmap, base + i * sizeof(sample),
+                                      &sample, sizeof(sample));
                if (ret < 0)
                        goto done;
                buf[j++] = sample;