]> git.ipfire.org Git - thirdparty/kernel/stable.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:42:36 +0000 (13:42 +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 b4ded36cc416211080a08392c5e5007322693384..1d98198c4bdfb413c2a30719ef6bd0872fa41ba4 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
@@ -410,7 +411,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;
        }