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

Commit 7fd6592d authored by Nikolaus Schulz's avatar Nikolaus Schulz Committed by Jonathan Cameron
Browse files

iio: core: Fix IIO_VAL_FRACTIONAL_LOG2 for negative values 



Fix formatting of negative values of type IIO_VAL_FRACTIONAL_LOG2 by
switching from do_div(), which can't handle negative numbers, to
div_s64_rem().  Also use shift_right for shifting, which is safe with
negative values.

Signed-off-by: default avatarNikolaus Schulz <nikolaus.schulz@avionic-design.de>
Reviewed-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 51f528a1

drivers/iio/industrialio-core.c

+3 −4
Original line number Diff line number Diff line
@@ -610,10 +610,9 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type, 
		tmp0 = (int)div_s64_rem(tmp, 1000000000, &tmp1);

		return snprintf(buf, len, "%d.%09u", tmp0, abs(tmp1));

	case IIO_VAL_FRACTIONAL_LOG2:

		tmp = (s64)vals[0] * 1000000000LL >> vals[1];

		tmp1 = do_div(tmp, 1000000000LL);

		tmp0 = tmp;

		return snprintf(buf, len, "%d.%09u", tmp0, tmp1);

		tmp = shift_right((s64)vals[0] * 1000000000LL, vals[1]);

		tmp0 = (int)div_s64_rem(tmp, 1000000000LL, &tmp1);

		return snprintf(buf, len, "%d.%09u", tmp0, abs(tmp1));

	case IIO_VAL_INT_MULTIPLE:

	{

		int i;