Commit e3858236210184f0bfc2dd7f5188573b54084d5f

Authored by Liam Beguin
Committed by Greg Kroah-Hartman
1 parent 1cb35faea3

iio: inkern: apply consumer scale on IIO_VAL_INT cases

commit 1bca97ff95c732a516ebb68da72814194980e0a5 upstream.

When a consumer calls iio_read_channel_processed() and the channel has
an integer scale, the scale channel scale is applied and the processed
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: 48e44ce0f881 ("iio:inkern: Add function to read the processed value")
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-2-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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/iio/inkern.c
... ... @@ -599,7 +599,7 @@
599 599  
600 600 switch (scale_type) {
601 601 case IIO_VAL_INT:
602   - *processed = raw64 * scale_val;
  602 + *processed = raw64 * scale_val * scale;
603 603 break;
604 604 case IIO_VAL_INT_PLUS_MICRO:
605 605 if (scale_val2 < 0)