iio: imu: st_lsm6dsx: Fix selection of ST_LSM6DS3_ID
Subsystems (2)
PATCH v2 1/1 iio: imu: st_lsm6dsx: Fix selection of ST_LSM6DS3_ID
At the moment, attempting to probe a device with ST_LSM6DS3_ID (e.g. using the st,lsm6ds3 compatible) fails with:
st_lsm6dsx_i2c 1-006b: unsupported whoami [69]
... even though 0x69 is the whoami listed for ST_LSM6DS3_ID.
This happens because st_lsm6dsx_check_whoami() also attempts to match unspecified (zero-initialized) entries in the "id" array. ST_LSM6DS3_ID = 0 will therefore match any entry in st_lsm6dsx_sensor_settings (here: the first), because none of them actually have all 12 entries listed in the "id" array.
Avoid this by additionally checking if "name" is set, which is only set for valid entries in the "id" array.
Note: Although the problem was introduced earlier it did not surface until commit 52f4b1f19679 ("iio: imu: st_lsm6dsx: add support for accel/gyro unit of lsm9ds1") because ST_LSM6DS3_ID was the first entry in st_lsm6dsx_sensor_settings.
---
v1: https://lore.kernel.org/linux-iio/[email protected]/
Changes in v2:
- Add Acked-by: Lorenzo Bianconi <[email protected]>
- Add Fixes tag
- Cc [email protected]
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +2 -1
@@ -1301,7 +1301,8 @@ static int st_lsm6dsx_check_whoami(struct st_lsm6dsx_hw *hw, int id,for (i =0 ; i <ARRAY_SIZE (st_lsm6dsx_sensor_settings); i++) {for (j =0 ; j <ST_LSM6DSX_MAX_ID ; j++) { -if (id == st_lsm6dsx_sensor_settings[i].id[j].hw_id) +if (st_lsm6dsx_sensor_settings[i].id[j].name && + id == st_lsm6dsx_sensor_settings[i].id[j].hw_id)break ; }if (j <ST_LSM6DSX_MAX_ID )
Signature · 1 line
2.24.1
Quoted 16 lines · On Mon, 16 Dec 2019 13:41:20 +0100 Stephan Gerhold <[email protected]> wrote:
At the moment, attempting to probe a device with
ST_LSM6DS3_ID(e.g. using the st,lsm6ds3 compatible) fails with:st_lsm6dsx_i2c 1-006b: unsupported whoami [69]... even though
0x69is the whoami listed forST_LSM6DS3_ID.This happens because
st_lsm6dsx_check_whoami()also attempts to match unspecified (zero-initialized) entries in the "id" array.ST_LSM6DS3_ID= 0 will therefore match any entry inst_lsm6dsx_sensor_settings(here: the first), because none of them actually have all 12 entries listed in the "id" array.Avoid this by additionally checking if "name" is set, which is only set for valid entries in the "id" array.
Quoted 8 lines
Note: Although the problem was introduced earlier it did not surface until commit
52f4b1f19679("iio: imu:st_lsm6dsx: add support for accel/gyro unit of lsm9ds1") becauseST_LSM6DS3_IDwas the first entry inst_lsm6dsx_sensor_settings.Fixes d068e4a0f921 ("iio: imu: st_lsm6dsx: add support to multiple devices with the same settings")Cc <[email protected]> # 5.4Acked-by Lorenzo Bianconi <[email protected]>Signed-off-by Stephan Gerhold <[email protected]>
Applied to the fixes-togreg branch of iio.git.
Thanks,
Jonathan
Quoted 25 lines
---
v1: https://lore.kernel.org/linux-iio/[email protected]/Changes in v2:
- Add Acked-by: Lorenzo Bianconi <[email protected]>
- Add Fixes tag
- Cc [email protected]--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +2
-1@@ -1301,7 +1301,8 @@ static int st_lsm6dsx_check_whoami(struct st_lsm6dsx_hw *hw, int id,for (i =0 ; i <ARRAY_SIZE (st_lsm6dsx_sensor_settings); i++) {for (j =0 ; j <ST_LSM6DSX_MAX_ID ; j++) { -if (id == st_lsm6dsx_sensor_settings[i].id[j].hw_id) +if (st_lsm6dsx_sensor_settings[i].id[j].name && + id == st_lsm6dsx_sensor_settings[i].id[j].hw_id)break ; }if (j <ST_LSM6DSX_MAX_ID )