]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 11 Mar 2015 14:54:39 +0000 (15:54 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 11 Mar 2015 14:54:39 +0000 (15:54 +0100)
added patches:
iio-imu-adis16400-fix-sign-extension.patch

queue-3.10/iio-imu-adis16400-fix-sign-extension.patch [new file with mode: 0644]
queue-3.10/series

diff --git a/queue-3.10/iio-imu-adis16400-fix-sign-extension.patch b/queue-3.10/iio-imu-adis16400-fix-sign-extension.patch
new file mode 100644 (file)
index 0000000..16c1c8a
--- /dev/null
@@ -0,0 +1,41 @@
+From 19e353f2b344ad86cea6ebbc0002e5f903480a90 Mon Sep 17 00:00:00 2001
+From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
+Date: Fri, 23 Jan 2015 00:34:02 +0100
+Subject: iio: imu: adis16400: Fix sign extension
+
+From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
+
+commit 19e353f2b344ad86cea6ebbc0002e5f903480a90 upstream.
+
+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>
+Signed-off-by: Jonathan Cameron <jic23@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/iio/imu/adis16400_core.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- 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
+               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:
index 95a662243095746b61a6bd81517d21ed616324ef..87dcfb7577b96b858b4c45fef9825faa3cdcf316 100644 (file)
@@ -21,3 +21,4 @@ mm-memory.c-actually-remap-enough-memory.patch
 target-check-for-lba-sectors-wrap-around-in-sbc_parse_cdb.patch
 pm-qos-remove-duplicate-call-to-pm_qos_update_target.patch
 x86-asm-entry-64-remove-a-bogus-ret_from_fork-optimization.patch
+iio-imu-adis16400-fix-sign-extension.patch