summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSu Hui <suhui@nfschina.com>2023-10-30 10:02:19 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-01-05 15:13:32 +0100
commit25c441a07360e8f877055ecd9601bb661182be9a (patch)
treef571ca30e0db6dc4ccf66213a2caf13ccb4bb2bb /drivers
parent3cbae23d481be4837b8c49403c26cad64c2c9001 (diff)
downloadlinux-25c441a07360e8f877055ecd9601bb661182be9a.tar.gz
linux-25c441a07360e8f877055ecd9601bb661182be9a.tar.bz2
linux-25c441a07360e8f877055ecd9601bb661182be9a.zip
iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw
[ Upstream commit c3df0e29fb7788c4b3ddf37d5ed87dda2b822943 ] 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> Link: https://lore.kernel.org/r/20231030020218.65728-1-suhui@nfschina.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iio/imu/inv_mpu6050/inv_mpu_core.c4
1 files 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 597768c29a72..caeef03b8c62 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -727,13 +727,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;