]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
iio: imu: st_lsm6dsx: remove invalid gain value for LSM9DS1
authorLorenzo Bianconi <lorenzo@kernel.org>
Tue, 27 Aug 2019 08:26:35 +0000 (10:26 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Tue, 3 Sep 2019 20:10:51 +0000 (21:10 +0100)
Get rid of invalid sensitivity value for LSM9DS1 gyro sensor

Fixes: 52f4b1f19679 ("iio: imu: st_lsm6dsx: add support for accel/gyro unit of lsm9ds1")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c

index fd152fff0a8c872aa334c38b970b70498a421b07..c85c8be3a024f32620016e79ae687e8b22362fe4 100644 (file)
@@ -151,10 +151,9 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
                                        .addr = 0x10,
                                        .mask = GENMASK(4, 3),
                                },
-                               .fs_avl[0] = { IIO_DEGREE_TO_RAD(245), 0x0 },
-                               .fs_avl[1] = { IIO_DEGREE_TO_RAD(500), 0x1 },
-                               .fs_avl[2] = { IIO_DEGREE_TO_RAD(0), 0x2 },
-                               .fs_avl[3] = { IIO_DEGREE_TO_RAD(2000), 0x3 },
+                               .fs_avl[0] = {  IIO_DEGREE_TO_RAD(245), 0x0 },
+                               .fs_avl[1] = {  IIO_DEGREE_TO_RAD(500), 0x1 },
+                               .fs_avl[2] = { IIO_DEGREE_TO_RAD(2000), 0x3 },
                        },
                },
        },
@@ -1196,13 +1195,19 @@ static ssize_t st_lsm6dsx_sysfs_scale_avail(struct device *dev,
                                            char *buf)
 {
        struct st_lsm6dsx_sensor *sensor = iio_priv(dev_get_drvdata(dev));
+       const struct st_lsm6dsx_fs_table_entry *fs_table;
        enum st_lsm6dsx_sensor_id id = sensor->id;
        struct st_lsm6dsx_hw *hw = sensor->hw;
        int i, len = 0;
 
-       for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++)
+       fs_table = &hw->settings->fs_table[id];
+       for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++) {
+               if (!fs_table->fs_avl[i].gain)
+                       break;
+
                len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
-                                hw->settings->fs_table[id].fs_avl[i].gain);
+                                fs_table->fs_avl[i].gain);
+       }
        buf[len - 1] = '\n';
 
        return len;