diff options
| author | Liam Beguin <liambeguin@gmail.com> | 2022-01-08 15:53:05 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-15 14:14:38 +0200 |
| commit | 45bfe8d801e19c7ad69b859a8298e0bc88072b22 (patch) | |
| tree | 686af896ee411fcadfd4169f96bad0d7f700c662 | |
| parent | c9d89beeaadd2cab406983772b2063aa4e393ce1 (diff) | |
| download | linux-stable-45bfe8d801e19c7ad69b859a8298e0bc88072b22.tar.gz linux-stable-45bfe8d801e19c7ad69b859a8298e0bc88072b22.tar.bz2 linux-stable-45bfe8d801e19c7ad69b859a8298e0bc88072b22.zip | |
iio: inkern: apply consumer scale when no channel scale is available
commit 14b457fdde38de594a4bc4bd9075019319d978da upstream.
When a consumer calls iio_read_channel_processed() and no channel scale
is available, it's assumed that the scale is one and the raw value is
returned as expected.
On the other hand, if the consumer calls iio_convert_raw_to_processed()
the scaling factor requested by the consumer is not applied.
This for example causes the consumer to process mV when expecting uV.
Make sure to always apply the scaling factor requested by the consumer.
Fixes: adc8ec5ff183 ("iio: inkern: pass through raw values if no scaling")
Signed-off-by: Liam Beguin <liambeguin@gmail.com>
Reviewed-by: Peter Rosin <peda@axentia.se>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20220108205319.2046348-3-liambeguin@gmail.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/iio/inkern.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c index c4b986e8583f..d527ab9c5686 100644 --- a/drivers/iio/inkern.c +++ b/drivers/iio/inkern.c @@ -603,10 +603,10 @@ static int iio_convert_raw_to_processed_unlocked(struct iio_channel *chan, IIO_CHAN_INFO_SCALE); if (scale_type < 0) { /* - * Just pass raw values as processed if no scaling is - * available. + * If no channel scaling is available apply consumer scale to + * raw value and return. */ - *processed = raw; + *processed = raw * scale; return 0; } |