diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2014-01-12 23:51:13 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-06-09 03:08:45 +0200 |
| commit | 66950ba114b973630d00179cefa92e5cae0c9e2e (patch) | |
| tree | d9190ee58d1572dca48c97c4ad8fef392eccc740 | |
| parent | 142406ddab5df688036cebe36c0ac87ed572e67c (diff) | |
| download | kernel_samsung_espresso10-66950ba114b973630d00179cefa92e5cae0c9e2e.tar.gz kernel_samsung_espresso10-66950ba114b973630d00179cefa92e5cae0c9e2e.tar.bz2 kernel_samsung_espresso10-66950ba114b973630d00179cefa92e5cae0c9e2e.zip | |
sec_ts: Avoid loading firmwares
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
| -rw-r--r-- | drivers/input/touchscreen/mms136.c | 12 | ||||
| -rw-r--r-- | drivers/input/touchscreen/synaptics_s7301.c | 5 |
2 files changed, 2 insertions, 15 deletions
diff --git a/drivers/input/touchscreen/mms136.c b/drivers/input/touchscreen/mms136.c index c4b38038bbd..a45df71e6da 100644 --- a/drivers/input/touchscreen/mms136.c +++ b/drivers/input/touchscreen/mms136.c @@ -144,8 +144,7 @@ static bool fw_updater(struct ts_data *ts, char const *mode) if (request_firmware(&fw, ts->platform_data->fw_name, &client->dev)) { pr_err("tsp: fail to request built-in firmware\n"); - ret = false; - goto out; + return true; } if (ts_read_reg_data(ts, TS_READ_VERSION_ADDR, 4, buf) > 0) { @@ -456,15 +455,6 @@ static int __devinit ts_probe(struct i2c_client *client, ts->early_suspend.resume = ts_late_resume; register_early_suspend(&ts->early_suspend); #endif - /* Check to fw. update necessity */ - if (!fw_updater(ts, "normal")) { - i = 3; - pr_err("tsp: ts_probe: fw. update failed. retry %d", i); - while (i--) { - if (fw_updater(ts, "force")) - break; - } - } if (ts->client->irq) { tsp_log("trying to request irq: %s-%d", diff --git a/drivers/input/touchscreen/synaptics_s7301.c b/drivers/input/touchscreen/synaptics_s7301.c index a4cf2a9348f..749f2ad9243 100644 --- a/drivers/input/touchscreen/synaptics_s7301.c +++ b/drivers/input/touchscreen/synaptics_s7301.c @@ -145,7 +145,7 @@ static bool fw_updater(struct ts_data *ts, char *mode) if (request_firmware(&fw, ts->platform_data->fw_name, &ts->client->dev)) { pr_err("tsp: fail to request built-in firmware\n"); - goto out; + return true; } ts->fw_info->version[0] = fw->data[0xb100]; @@ -431,9 +431,6 @@ static int __devinit ts_probe(struct i2c_client *client, if (ts->platform_data->set_power) ts->platform_data->set_power(true); - /* Check the new fw. and update */ - fw_updater(ts, "normal"); - if (ts->client->irq) { tsp_debug("trying to request irq: %s %d\n", ts->client->name, ts->client->irq); |