Commit a16d8c4e authored by Nikolaus Schulz's avatar Nikolaus Schulz Committed by Greg Kroah-Hartman

iio: core: Fix IIO_VAL_FRACTIONAL_LOG2 for negative values

commit 7fd6592d upstream.

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>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d50669c
...@@ -608,10 +608,9 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type, ...@@ -608,10 +608,9 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type,
tmp0 = (int)div_s64_rem(tmp, 1000000000, &tmp1); tmp0 = (int)div_s64_rem(tmp, 1000000000, &tmp1);
return snprintf(buf, len, "%d.%09u", tmp0, abs(tmp1)); return snprintf(buf, len, "%d.%09u", tmp0, abs(tmp1));
case IIO_VAL_FRACTIONAL_LOG2: case IIO_VAL_FRACTIONAL_LOG2:
tmp = (s64)vals[0] * 1000000000LL >> vals[1]; tmp = shift_right((s64)vals[0] * 1000000000LL, vals[1]);
tmp1 = do_div(tmp, 1000000000LL); tmp0 = (int)div_s64_rem(tmp, 1000000000LL, &tmp1);
tmp0 = tmp; return snprintf(buf, len, "%d.%09u", tmp0, abs(tmp1));
return snprintf(buf, len, "%d.%09u", tmp0, tmp1);
case IIO_VAL_INT_MULTIPLE: case IIO_VAL_INT_MULTIPLE:
{ {
int i; int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment