patch "iio: imu: fxos8700: fix swapped ACCEL and MAGN channels readback" added to char-misc-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
iio: imu: fxos8700: fix swapped ACCEL and MAGN channels readback
to my char-misc git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
in the char-misc-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
From c68b44bc7d9b1469774a1c985ee71d2cbc5ebef5 Mon Sep 17 00:00:00 2001
From: Carlos Song <[email protected]>
Date: Thu, 8 Dec 2022 15:19:06 +0800
Subject: 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.
--- drivers/iio/imu/fxos8700_core.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/iio/imu/fxos8700_core.c +15 -2
@@ -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,
Signature · 1 line
2.39.1