Commit c68b44bc authored by Carlos Song's avatar Carlos Song Committed by Jonathan Cameron
Browse files

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



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

Fixes: 84e5ddd5 ("iio: imu: Add support for the FXOS8700 IMU")
Signed-off-by: default avatarCarlos 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: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 429e1e8e

drivers/iio/imu/fxos8700_core.c

+15 −2
Original line number Diff line number Diff line
@@ -395,9 +395,22 @@ static int fxos8700_get_data(struct fxos8700_data *data, int chan_type, 
{

	u8 base, reg;

	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,