Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1cad4f0 authored by Matteo Martelli's avatar Matteo Martelli Committed by Greg Kroah-Hartman
Browse files

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: 48e44ce0 ("iio:inkern: Add function to read the processed value")
Signed-off-by: default avatarMatteo 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: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0edd1eac

drivers/iio/inkern.c

+4 −4
Original line number Diff line number Diff line
@@ -640,17 +640,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;