]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Input: ads7846 - fix unaligned access on 7845
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 12 Nov 2020 01:17:11 +0000 (17:17 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Dec 2020 12:46:54 +0000 (13:46 +0100)
[ Upstream commit 03e2c9c782f721b661a0e42b1b58f394b5298544 ]

req->sample[1] is not naturally aligned at word boundary, and therefore we
should use get_unaligned_be16() when accessing it.

Fixes: 3eac5c7e44f3 ("Input: ads7846 - extend the driver for ads7845 controller support")
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/input/touchscreen/ads7846.c

index 7ce0eedaa0e5e234a171ead0cdb5d0cce5ea8e89..b536768234b7c096ee73004cb63553bfaf2e6af1 100644 (file)
@@ -35,6 +35,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/module.h>
 #include <asm/irq.h>
+#include <asm/unaligned.h>
 
 /*
  * This code has been heavily tested on a Nokia 770, and lightly
@@ -434,7 +435,7 @@ static int ads7845_read12_ser(struct device *dev, unsigned command)
 
        if (status == 0) {
                /* BE12 value, then padding */
-               status = be16_to_cpu(*((u16 *)&req->sample[1]));
+               status = get_unaligned_be16(&req->sample[1]);
                status = status >> 3;
                status &= 0x0fff;
        }