OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Input: ads7846 - fix unaligned access on 7845

Browse Source 
[ 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: 3eac5c7e44 ("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>
This commit is contained in:
Dmitry Torokhov 2020-11-11 17:17:11 -08:00 committed by Greg Kroah-Hartman
parent 920c379029
commit e6405aad35
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/input/touchscreen/ads7846.c
View File

@ -33,6 +33,7 @@
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/unaligned.h>
/* /*
* This code has been heavily tested on a Nokia 770, and lightly * 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) { if (status == 0) {
/* BE12 value, then padding */ /* BE12 value, then padding */
status = be16_to_cpu(*((u16 *)&req->sample[1])); status = get_unaligned_be16(&req->sample[1]);
status = status >> 3; status = status >> 3;
status &= 0x0fff; status &= 0x0fff;
} }