lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 149/717] Input: ads7846 - fix unaligned access on 7845
    Date
    From: Dmitry Torokhov <dmitry.torokhov@gmail.com>

    [ 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 | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
    index 78ed285c27ae3..ff97897feaf2a 100644
    --- a/drivers/input/touchscreen/ads7846.c
    +++ b/drivers/input/touchscreen/ads7846.c
    @@ -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
    @@ -435,7 +436,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;
    }
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:12    [W:2.444 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site