@@ -151,9 +151,10 @@ 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(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(0), 0x2 },
+ .fs_avl[3] = { IIO_DEGREE_TO_RAD(2000), 0x3 },
},
},
},
@@ -1195,19 +1196,13 @@ 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;
- 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;
-
+ for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++)
len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
- fs_table->fs_avl[i].gain);
- }
+ hw->settings->fs_table[id].fs_avl[i].gain);
buf[len - 1] = '\n';
return len;
The st_lsm6dsx_sensor_settings struct's fs_avl[] array is expected to be of size 4. We can't define it to be of size 3 and try to access the 4th element below. Commit c8d4066c7246 ("iio: imu: st_lsm6dsx: remove invalid gain value for LSM9DS1") which is a "cleanup" change, results in an Ooops here so revert it. Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm> --- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)