iio: imu: fxos8700: fix swapped ACCEL and MAGN channels readback

commit c68b44bc7d9b1469774a1c985ee71d2cbc5ebef5 upstream.

Because ACCEL and MAGN channels data register base address is
swapped the accelerometer and magnetometer channels readback is
swapped.

Fixes: 2c7e7594a2fd ("iio: imu: Add support for the FXOS8700 IMU")
Signed-off-by: Carlos Song <carlos.song@nxp.com>
Link: https://lore.kernel.org/r/20221208071911.2405922-3-carlos.song@nxp.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/iio/imu/fxos8700_core.c b/drivers/iio/imu/fxos8700_core.c
index 3a98b44bb1cbd57457f5a3ba7572e1725f355dcf..ec622123ccac1b97a41d137c3be0eb2c932b6310 100644 (file)
--- a/drivers/iio/imu/fxos8700_core.c
+++ b/drivers/iio/imu/fxos8700_core.c
@@ -420,9 +420,22 @@ static int fxos8700_get_data(struct fxos8700_data *data, int chan_type,
        u8 base, reg;
        s16 tmp;
        int ret;
-       enum fxos8700_sensor type = fxos8700_to_sensor(chan_type);
 
-       base = type ? FXOS8700_OUT_X_MSB : FXOS8700_M_OUT_X_MSB;
+       /*
+        * Different register base addresses varies with channel types.
+        * This bug hasn't been noticed before because using an enum is
+        * really hard to read. Use an a switch statement to take over that.
+        */
+       switch (chan_type) {
+       case IIO_ACCEL:
+               base = FXOS8700_OUT_X_MSB;
+               break;
+       case IIO_MAGN:
+               base = FXOS8700_M_OUT_X_MSB;
+               break;
+       default:
+               return -EINVAL;
+       }
 
        /* Block read 6 bytes of device output registers to avoid data loss */
        ret = regmap_bulk_read(data->regmap, base, data->buf,