iio: fix scale application in iio_convert_raw_to_processed_unlocked

commit 8a3dcc970dc57b358c8db2702447bf0af4e0d83a upstream.

When the scale_type is IIO_VAL_INT_PLUS_MICRO or IIO_VAL_INT_PLUS_NANO
the scale passed as argument is only applied to the fractional part of
the value. Fix it by also multiplying the integer part by the scale
provided.

Fixes: 48e44ce0f881 ("iio:inkern: Add function to read the processed value")
Signed-off-by: Matteo Martelli <matteomartelli3@gmail.com>
Link: https://patch.msgid.link/20240730-iio-fix-scale-v1-1-6246638c8daa@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>

diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index b855565384757361e0ec7146d6108f7ed576e231..80e1c45485c9b017bfd4c524c4d4c91f107935ed 100644 (file)
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -680,17 +680,17 @@ static int iio_convert_raw_to_processed_unlocked(struct iio_channel *chan,
                break;
        case IIO_VAL_INT_PLUS_MICRO:
                if (scale_val2 < 0)
-                       *processed = -raw64 * scale_val;
+                       *processed = -raw64 * scale_val * scale;
                else
-                       *processed = raw64 * scale_val;
+                       *processed = raw64 * scale_val * scale;
                *processed += div_s64(raw64 * (s64)scale_val2 * scale,
                                      1000000LL);
                break;
        case IIO_VAL_INT_PLUS_NANO:
                if (scale_val2 < 0)
-                       *processed = -raw64 * scale_val;
+                       *processed = -raw64 * scale_val * scale;
                else
-                       *processed = raw64 * scale_val;
+                       *processed = raw64 * scale_val * scale;
                *processed += div_s64(raw64 * (s64)scale_val2 * scale,
                                      1000000000LL);
                break;