iio: imu: st_lsm6dsx: do not use a fixed read len in read_oneshot
authorLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Sat, 17 Nov 2018 18:04:27 +0000 (19:04 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 25 Nov 2018 14:06:30 +0000 (14:06 +0000)
Generalize st_lsm6dsx_shub_read_oneshot in order to not use a fixed
read length and take into account iio channel realbits for single
read operations

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c

index ee59b0cac84fd8d64305d534b71d1e09326e6dd7..8e47dccdd40f58af220b2bb4e34f30ea2b94de22 100644 (file)
@@ -432,8 +432,8 @@ st_lsm6dsx_shub_read_oneshot(struct st_lsm6dsx_sensor *sensor,
                             struct iio_chan_spec const *ch,
                             int *val)
 {
-       int err, delay, len = ch->scan_type.realbits >> 3;
-       __le16 data;
+       int err, delay, len;
+       u8 data[4];
 
        err = st_lsm6dsx_shub_set_enable(sensor, true);
        if (err < 0)
@@ -442,15 +442,17 @@ st_lsm6dsx_shub_read_oneshot(struct st_lsm6dsx_sensor *sensor,
        delay = 1000000 / sensor->odr;
        usleep_range(delay, 2 * delay);
 
-       err = st_lsm6dsx_shub_read(sensor, ch->address, (u8 *)&data, len);
-       if (err < 0)
-               return err;
+       len = min_t(int, sizeof(data), ch->scan_type.realbits >> 3);
+       err = st_lsm6dsx_shub_read(sensor, ch->address, data, len);
 
        st_lsm6dsx_shub_set_enable(sensor, false);
 
+       if (err < 0)
+               return err;
+
        switch (len) {
        case 2:
-               *val = (s16)le16_to_cpu(data);
+               *val = (s16)le16_to_cpu(*((__le16 *)data));
                break;
        default:
                return -EINVAL;