Skip to contentSkip to conversation

iio: imu: lsm6dsx: Fix mount matrix retrieval

PATCH Superseded Alejandro Tafalla 1 participant 1 message Jul 13, 2023

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 iio: imu: lsm6dsx: Fix mount matrix retrieval

The function lsm6dsx_get_acpi_mount_matrix should return an error when ACPI support is not enabled to allow executing iio_read_mount_matrix in the probe function.

Fixes dc3d25f22b88 ("iio: imu: lsm6dsx: Add ACPI mount matrix retrieval")

---
Changes in v2:
- Use of error codes instead of true/false.

---
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/iio/imu/ renamed from drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +0 -0

st_lsm6dsx/st_lsm6dsx_core.c
index 6a18b363cf73..1a4752c95601 100644

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +0 -0
@@ -2687,7 +2687,7 @@ static int lsm6dsx_get_acpi_mount_matrix(struct device 

*dev,
static int lsm6dsx_get_acpi_mount_matrix(struct device *dev,
struct iio_mount_matrix
*orientation)
{
- return false;
+ return -EOPNOTSUPP;
}

#endif
@@ -2767,11 +2767,11 @@ int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,
}

err = lsm6dsx_get_acpi_mount_matrix(hw->dev, &hw->orientation);
- if (err) {
+ if (err == -EOPNOTSUPP)
err = iio_read_mount_matrix(hw->dev, &hw->orientation);
- if (err)
- return err;
- }
+
+ if (err)
+ return err;

for (i = 0; i < ST_LSM6DSX_ID_MAX; i++) {
if (!hw->iio_devs[i])

Signature · 1 line
2.41.0