aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2016-09-07 22:32:14 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-09-10 13:49:15 -0400
commit4af2ff91ec3f42b538a65cf12df5f9faf6aaa914 (patch)
treea8e4dcbeddb4a9c2c02efb69f78773ad74504c22
parent43ba588346455dcc984dc98a49af1c2eb1e9aa75 (diff)
Input: silead_gsl1680 - use "silead/" prefix for firmware loading
The silead touch-controller ICs use a different firmware per digitizer / tablet model. So there are going to be quite a few of then and they really should be under a separate subdir. This commit prefixes the default firmware names with "silead/" just like we are already doing for devicetree specified firmware names. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/touchscreen/silead.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c
index c7ab116a16b3..f502c8488be8 100644
--- a/drivers/input/touchscreen/silead.c
+++ b/drivers/input/touchscreen/silead.c
@@ -411,14 +411,14 @@ static int silead_ts_set_default_fw_name(struct silead_ts_data *data,
411 if (!acpi_id) 411 if (!acpi_id)
412 return -ENODEV; 412 return -ENODEV;
413 413
414 snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw", 414 snprintf(data->fw_name, sizeof(data->fw_name),
415 acpi_id->id); 415 "silead/%s.fw", acpi_id->id);
416 416
417 for (i = 0; i < strlen(data->fw_name); i++) 417 for (i = 0; i < strlen(data->fw_name); i++)
418 data->fw_name[i] = tolower(data->fw_name[i]); 418 data->fw_name[i] = tolower(data->fw_name[i]);
419 } else { 419 } else {
420 snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw", 420 snprintf(data->fw_name, sizeof(data->fw_name),
421 id->name); 421 "silead/%s.fw", id->name);
422 } 422 }
423 423
424 return 0; 424 return 0;
@@ -427,7 +427,8 @@ static int silead_ts_set_default_fw_name(struct silead_ts_data *data,
427static int silead_ts_set_default_fw_name(struct silead_ts_data *data, 427static int silead_ts_set_default_fw_name(struct silead_ts_data *data,
428 const struct i2c_device_id *id) 428 const struct i2c_device_id *id)
429{ 429{
430 snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw", id->name); 430 snprintf(data->fw_name, sizeof(data->fw_name),
431 "silead/%s.fw", id->name);
431 return 0; 432 return 0;
432} 433}
433#endif 434#endif