aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/touchscreen/mms136.c12
-rw-r--r--drivers/input/touchscreen/synaptics_s7301.c5
2 files changed, 2 insertions, 15 deletions
diff --git a/drivers/input/touchscreen/mms136.c b/drivers/input/touchscreen/mms136.c
index c4b3803..a45df71 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 a4cf2a9..749f2ad 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);