Commit dde27443 authored by Julian Sax's avatar Julian Sax Committed by Dmitry Torokhov

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: default avatarJulian Sax <jsbc@gmx.de>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 20bbb312
...@@ -558,20 +558,33 @@ static int __maybe_unused silead_ts_suspend(struct device *dev) ...@@ -558,20 +558,33 @@ static int __maybe_unused silead_ts_suspend(struct device *dev)
static int __maybe_unused silead_ts_resume(struct device *dev) static int __maybe_unused silead_ts_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
bool second_try = false;
int error, status; int error, status;
silead_ts_set_power(client, SILEAD_POWER_ON); silead_ts_set_power(client, SILEAD_POWER_ON);
retry:
error = silead_ts_reset(client); error = silead_ts_reset(client);
if (error) if (error)
return error; return error;
if (second_try) {
error = silead_ts_load_fw(client);
if (error)
return error;
}
error = silead_ts_startup(client); error = silead_ts_startup(client);
if (error) if (error)
return error; return error;
status = silead_ts_get_status(client); status = silead_ts_get_status(client);
if (status != SILEAD_STATUS_OK) { 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); dev_err(dev, "Resume error, status: 0x%02x\n", status);
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment