| Message ID | 20231030020218.65728-1-suhui@nfschina.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v3] iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw | expand |
On Mon, 30 Oct 2023 10:02:19 +0800 Su Hui <suhui@nfschina.com> wrote: > inv_mpu6050_sensor_show() can return -EINVAL or IIO_VAL_INT. Return the > true value rather than only return IIO_VAL_INT. > > Fixes: d5098447147c ("iio: imu: mpu6050: add calibration offset support") > Signed-off-by: Su Hui <suhui@nfschina.com> Applied to the fixes-togreg branch of iio.git. It's independent enough from the improved error reporting that they can hopefully got through different branches. Thanks, Jonathan > --- > v3: > - add Fixes tag > v2: > - fix the error of commit title. > v1: > - https://lore.kernel.org/all/20231020091413.205743-2-suhui@nfschina.com/ > > drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > index 29f906c884bd..a9a5fb266ef1 100644 > --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > @@ -749,13 +749,13 @@ inv_mpu6050_read_raw(struct iio_dev *indio_dev, > ret = inv_mpu6050_sensor_show(st, st->reg->gyro_offset, > chan->channel2, val); > mutex_unlock(&st->lock); > - return IIO_VAL_INT; > + return ret; > case IIO_ACCEL: > mutex_lock(&st->lock); > ret = inv_mpu6050_sensor_show(st, st->reg->accl_offset, > chan->channel2, val); > mutex_unlock(&st->lock); > - return IIO_VAL_INT; > + return ret; > > default: > return -EINVAL;
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c index 29f906c884bd..a9a5fb266ef1 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c @@ -749,13 +749,13 @@ inv_mpu6050_read_raw(struct iio_dev *indio_dev, ret = inv_mpu6050_sensor_show(st, st->reg->gyro_offset, chan->channel2, val); mutex_unlock(&st->lock); - return IIO_VAL_INT; + return ret; case IIO_ACCEL: mutex_lock(&st->lock); ret = inv_mpu6050_sensor_show(st, st->reg->accl_offset, chan->channel2, val); mutex_unlock(&st->lock); - return IIO_VAL_INT; + return ret; default: return -EINVAL;
inv_mpu6050_sensor_show() can return -EINVAL or IIO_VAL_INT. Return the true value rather than only return IIO_VAL_INT. Fixes: d5098447147c ("iio: imu: mpu6050: add calibration offset support") Signed-off-by: Su Hui <suhui@nfschina.com> --- v3: - add Fixes tag v2: - fix the error of commit title. v1: - https://lore.kernel.org/all/20231020091413.205743-2-suhui@nfschina.com/ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)