Skip to content

Commit

Permalink
Input: ads7846 - fix unaligned access on 7845
Browse files Browse the repository at this point in the history
[ Upstream commit 03e2c9c ]

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

Fixes: 3eac5c7 ("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>
  • Loading branch information
dtor authored and gregkh committed Dec 30, 2020
1 parent 920c379 commit e6405aa
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/input/touchscreen/ads7846.c
Expand Up @@ -33,6 +33,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
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit e6405aa

Please sign in to comment.