summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/silead.c
diff options
context:
space:
mode:
authorJulian Sax <jsbc@gmx.de>2018-10-05 20:48:31 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-10-05 20:52:06 +0200
commitdde27443211062e841806feaf690674b7c3a599f (patch)
tree5d4bd9748d07e43c9416dc07c7dcaee0d39c8632 /drivers/input/touchscreen/silead.c
parentInput: st1232 - set INPUT_PROP_DIRECT property (diff)
downloadlinux-dde27443211062e841806feaf690674b7c3a599f.tar.xz
linux-dde27443211062e841806feaf690674b7c3a599f.zip
Input: silead - try firmware reload after unsuccessful resume
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>
Diffstat (limited to 'drivers/input/touchscreen/silead.c')
-rw-r--r--drivers/input/touchscreen/silead.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c
index ff7043f74a3d..da1fdd16855e 100644
--- a/drivers/input/touchscreen/silead.c
+++ b/drivers/input/touchscreen/silead.c
@@ -558,20 +558,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;
}