[ Sasha's backport helper bot ] Hi, Found matching upstream commit: ef5f5e7b6f73f79538892a8be3a3bee2342acc9f WARNING: Author mismatch between patch and found commit: Backport author: inv.git-commit@xxxxxxx Commit author: Jean-Baptiste Maneyrol <jean-baptiste.maneyrol@xxxxxxx> Status in newer kernel trees: 6.12.y | Not found 6.6.y | Not found Note: The patch differs from the upstream commit: --- 1: ef5f5e7b6f73f ! 1: cd8eeb84a6377 iio: invensense: fix multiple odr switch when FIFO is off @@ Commit message Signed-off-by: Jean-Baptiste Maneyrol <jean-baptiste.maneyrol@xxxxxxx> Link: https://patch.msgid.link/20241021-invn-inv-sensors-timestamp-fix-switch-fifo-off-v2-1-39ffd43edcc4@xxxxxxx Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> + (cherry picked from commit ef5f5e7b6f73f79538892a8be3a3bee2342acc9f) ## drivers/iio/common/inv_sensors/inv_sensors_timestamp.c ## @@ drivers/iio/common/inv_sensors/inv_sensors_timestamp.c: int inv_sensors_timestamp_update_odr(struct inv_sensors_timestamp *ts, @@ drivers/iio/common/inv_sensors/inv_sensors_timestamp.c: int inv_sensors_timestam ## drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c ## @@ drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c: static int inv_icm42600_accel_update_scan_mode(struct iio_dev *indio_dev, + const unsigned long *scan_mask) { struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev); - struct inv_icm42600_sensor_state *accel_st = iio_priv(indio_dev); -- struct inv_sensors_timestamp *ts = &accel_st->ts; +- struct inv_sensors_timestamp *ts = iio_priv(indio_dev); struct inv_icm42600_sensor_conf conf = INV_ICM42600_SENSOR_CONF_INIT; unsigned int fifo_en = 0; unsigned int sleep_temp = 0; @@ drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c: static int inv_icm42600_gyro_u const unsigned long *scan_mask) { struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev); -- struct inv_icm42600_sensor_state *gyro_st = iio_priv(indio_dev); -- struct inv_sensors_timestamp *ts = &gyro_st->ts; +- struct inv_sensors_timestamp *ts = iio_priv(indio_dev); struct inv_icm42600_sensor_conf conf = INV_ICM42600_SENSOR_CONF_INIT; unsigned int fifo_en = 0; unsigned int sleep_gyro = 0; --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |