projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into sched/core, to pick up fixes
[cascardo/linux.git]
/
drivers
/
input
/
touchscreen
/
silead.c
diff --git
a/drivers/input/touchscreen/silead.c
b/drivers/input/touchscreen/silead.c
index
b2744a6
..
f502c84
100644
(file)
--- a/
drivers/input/touchscreen/silead.c
+++ b/
drivers/input/touchscreen/silead.c
@@
-390,9
+390,10
@@
static void silead_ts_read_props(struct i2c_client *client)
data->max_fingers = 5; /* Most devices handle up-to 5 fingers */
}
data->max_fingers = 5; /* Most devices handle up-to 5 fingers */
}
- error = device_property_read_string(dev, "
touchscreen-fw
-name", &str);
+ error = device_property_read_string(dev, "
firmware
-name", &str);
if (!error)
if (!error)
- snprintf(data->fw_name, sizeof(data->fw_name), "%s", str);
+ snprintf(data->fw_name, sizeof(data->fw_name),
+ "silead/%s", str);
else
dev_dbg(dev, "Firmware file name read error. Using default.");
}
else
dev_dbg(dev, "Firmware file name read error. Using default.");
}
@@
-410,14
+411,14
@@
static int silead_ts_set_default_fw_name(struct silead_ts_data *data,
if (!acpi_id)
return -ENODEV;
if (!acpi_id)
return -ENODEV;
- snprintf(data->fw_name, sizeof(data->fw_name),
"%s.fw",
- acpi_id->id);
+ snprintf(data->fw_name, sizeof(data->fw_name),
+
"silead/%s.fw",
acpi_id->id);
for (i = 0; i < strlen(data->fw_name); i++)
data->fw_name[i] = tolower(data->fw_name[i]);
} else {
for (i = 0; i < strlen(data->fw_name); i++)
data->fw_name[i] = tolower(data->fw_name[i]);
} else {
- snprintf(data->fw_name, sizeof(data->fw_name),
"%s.fw",
- id->name);
+ snprintf(data->fw_name, sizeof(data->fw_name),
+
"silead/%s.fw",
id->name);
}
return 0;
}
return 0;
@@
-426,7
+427,8
@@
static int silead_ts_set_default_fw_name(struct silead_ts_data *data,
static int silead_ts_set_default_fw_name(struct silead_ts_data *data,
const struct i2c_device_id *id)
{
static int silead_ts_set_default_fw_name(struct silead_ts_data *data,
const struct i2c_device_id *id)
{
- snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw", id->name);
+ snprintf(data->fw_name, sizeof(data->fw_name),
+ "silead/%s.fw", id->name);
return 0;
}
#endif
return 0;
}
#endif