diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-03-19 08:57:04 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-03-19 08:57:04 +0800 |
commit | ba0bfedf4c9cad58f56a7038d1462ffc21cd33df (patch) | |
tree | bc5582403ad15b835d1b69b2ab81bda44292f3e3 /drivers/iio/imu/adis16400_core.c | |
parent | 43e7406efd7822d75c64310461d2cbca0ece19f0 (diff) | |
parent | 7f4e64246049cef5ae1eca37eec1701a9477799e (diff) |
Merge tag 'v3.10.72' into linux-linaro-lsklsk-v3.10-15.03linux-linaro-lsk-v3.10
This is the 3.10.72 stable release
Diffstat (limited to 'drivers/iio/imu/adis16400_core.c')
-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 d6ece2d17dec..7d60c85cc16d 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> @@ -447,7 +448,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: |