summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan+linaro@kernel.org>2024-05-30 09:44:16 +0200
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2024-06-03 21:29:31 +0200
commit78f0dfa64cbd05f381849377a32e0a2f1afe9215 (patch)
tree72efa265920a4dad2aad7bb090e13ccc65836920
parentiio: imu: inv_mpu6050: stabilized timestamping in interrupt (diff)
downloadlinux-78f0dfa64cbd05f381849377a32e0a2f1afe9215.tar.xz
linux-78f0dfa64cbd05f381849377a32e0a2f1afe9215.zip
iio: inkern: fix channel read regression
A recent "cleanup" broke IIO channel read outs and thereby thermal mitigation on the Lenovo ThinkPad X13s by returning zero instead of the expected IIO value type in iio_read_channel_processed_scale(): thermal thermal_zone12: failed to read out thermal zone (-22) Fixes: 3092bde731ca ("iio: inkern: move to the cleanup.h magic") Cc: Nuno Sa <nuno.sa@analog.com> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Link: https://lore.kernel.org/r/20240530074416.13697-1-johan+linaro@kernel.org Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-rw-r--r--drivers/iio/inkern.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index 52d773261828..485e6fc44a04 100644
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -721,7 +721,7 @@ int iio_read_channel_processed_scale(struct iio_channel *chan, int *val,
return ret;
*val *= scale;
- return 0;
+ return ret;
} else {
ret = iio_channel_read(chan, val, NULL, IIO_CHAN_INFO_RAW);
if (ret < 0)