lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 023/266] Input: edt-ft5x06 - fix get_default register write access
    Date
    From: Marco Felsch <m.felsch@pengutronix.de>

    [ Upstream commit 255cdaf73412de13608fb776101402dca68bed2b ]

    Since commit b6eba86030bf ("Input: edt-ft5x06 - add offset support for
    ev-ft5726") offset-x and offset-y is supported. Devices using those
    offset parameters don't support the offset parameter so we need to add
    the NO_REGISTER check for edt_ft5x06_ts_get_defaults().

    Fixes: b6eba86030bf ("Input: edt-ft5x06 - add offset support for ev-ft5726")
    Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
    Link: https://lore.kernel.org/r/20200227112819.16754-2-m.felsch@pengutronix.de
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/input/touchscreen/edt-ft5x06.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
    index 240e8de24cd2..b41b97c962ed 100644
    --- a/drivers/input/touchscreen/edt-ft5x06.c
    +++ b/drivers/input/touchscreen/edt-ft5x06.c
    @@ -935,19 +935,25 @@ static void edt_ft5x06_ts_get_defaults(struct device *dev,

    error = device_property_read_u32(dev, "offset", &val);
    if (!error) {
    - edt_ft5x06_register_write(tsdata, reg_addr->reg_offset, val);
    + if (reg_addr->reg_offset != NO_REGISTER)
    + edt_ft5x06_register_write(tsdata,
    + reg_addr->reg_offset, val);
    tsdata->offset = val;
    }

    error = device_property_read_u32(dev, "offset-x", &val);
    if (!error) {
    - edt_ft5x06_register_write(tsdata, reg_addr->reg_offset_x, val);
    + if (reg_addr->reg_offset_x != NO_REGISTER)
    + edt_ft5x06_register_write(tsdata,
    + reg_addr->reg_offset_x, val);
    tsdata->offset_x = val;
    }

    error = device_property_read_u32(dev, "offset-y", &val);
    if (!error) {
    - edt_ft5x06_register_write(tsdata, reg_addr->reg_offset_y, val);
    + if (reg_addr->reg_offset_y != NO_REGISTER)
    + edt_ft5x06_register_write(tsdata,
    + reg_addr->reg_offset_y, val);
    tsdata->offset_y = val;
    }
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 04:27    [W:4.221 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site