diff options
| author |   Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2015-01-23 00:34:02 +0100 |
|---|---|---|
| committer |   Jonathan Cameron <jic23@kernel.org> | 2015-01-26 21:06:42 +0000 |
| commit | 19e353f2b344ad86cea6ebbc0002e5f903480a90 (patch) | |
| tree | a5a64f51ade752a2779877140bbb11c8ca8c51e3 /drivers/iio | |
| parent | staging: iio: ad2s1200: Fix sign extension (diff) | |
| download | linux-dev-19e353f2b344ad86cea6ebbc0002e5f903480a90.tar.xz linux-dev-19e353f2b344ad86cea6ebbc0002e5f903480a90.zip | |
iio: imu: adis16400: Fix sign extension
The intention is obviously to sign-extend a 12 bit quantity. But
because of C's promotion rules, the assignment is equivalent to "val16
&= 0xfff;". Use the proper API for this.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: Stable@vger.kernel.org
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/imu/adis16400_core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iio/imu/adis16400_core.c b/drivers/iio/imu/adis16400_core.c index b70873de04ea..fa795dcd5f75 100644 --- a/drivers/iio/imu/adis16400_core.c +++ b/drivers/iio/imu/adis16400_core.c @@ -26,6 +26,7 @@ #include <linux/list.h> #include <linux/module.h> #include <linux/debugfs.h> +#include <linux/bitops.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> @@ -414,7 +415,7 @@ static int adis16400_read_raw(struct iio_dev *indio_dev, mutex_unlock(&indio_dev->mlock); if (ret) return ret; - val16 = ((val16 & 0xFFF) << 4) >> 4; + val16 = sign_extend32(val16, 11); *val = val16; return IIO_VAL_INT; case IIO_CHAN_INFO_OFFSET: |