diff options
| author | Nikolaus Schulz <nikolaus.schulz@avionic-design.de> | 2017-03-24 13:41:51 +0100 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2017-04-02 11:14:49 +0100 |
| commit | 7fd6592d1287046f61bfd3cda3c03cd35be490f7 (patch) | |
| tree | a47926f7b3e59dbb76684b9f18a1c3f2f2ae9082 | |
| parent | 51f528a1636f352ad776a912ac86026ac7a89a2a (diff) | |
| download | linux-stable-7fd6592d1287046f61bfd3cda3c03cd35be490f7.tar.gz linux-stable-7fd6592d1287046f61bfd3cda3c03cd35be490f7.tar.bz2 linux-stable-7fd6592d1287046f61bfd3cda3c03cd35be490f7.zip | |
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: Nikolaus Schulz <nikolaus.schulz@avionic-design.de>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: stable@vger.kernel.org
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/iio/industrialio-core.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index d18ded45bedd..3ff91e02fee3 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -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; |