lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 193/222] Input: silead - try firmware reload after unsuccessful resume
    Date
    From: Julian Sax <jsbc@gmx.de>

    [ Upstream commit dde27443211062e841806feaf690674b7c3a599f ]

    A certain silead controller (Chip ID: 0x56810000) loses its firmware
    after suspend, causing the resume to fail. This patch tries to load
    the firmware, should a resume error occur and retries the resuming.

    Signed-off-by: Julian Sax <jsbc@gmx.de>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/input/touchscreen/silead.c | 13 +++++++++++++
    1 file changed, 13 insertions(+)

    diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c
    index f502c8488be86..867772878c0c8 100644
    --- a/drivers/input/touchscreen/silead.c
    +++ b/drivers/input/touchscreen/silead.c
    @@ -504,20 +504,33 @@ static int __maybe_unused silead_ts_suspend(struct device *dev)
    static int __maybe_unused silead_ts_resume(struct device *dev)
    {
    struct i2c_client *client = to_i2c_client(dev);
    + bool second_try = false;
    int error, status;

    silead_ts_set_power(client, SILEAD_POWER_ON);

    + retry:
    error = silead_ts_reset(client);
    if (error)
    return error;

    + if (second_try) {
    + error = silead_ts_load_fw(client);
    + if (error)
    + return error;
    + }
    +
    error = silead_ts_startup(client);
    if (error)
    return error;

    status = silead_ts_get_status(client);
    if (status != SILEAD_STATUS_OK) {
    + if (!second_try) {
    + second_try = true;
    + dev_dbg(dev, "Reloading firmware after unsuccessful resume\n");
    + goto retry;
    + }
    dev_err(dev, "Resume error, status: 0x%02x\n", status);
    return -ENODEV;
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-22 11:48    [W:4.062 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site