Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4af2ff91 authored by Hans de Goede's avatar Hans de Goede Committed by Dmitry Torokhov
Browse files

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: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 43ba5883

drivers/input/touchscreen/silead.c

+6 −5
Original line number Diff line number Diff line
@@ -411,14 +411,14 @@ static int silead_ts_set_default_fw_name(struct silead_ts_data *data, 
		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 {

		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;
@@ -427,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)

{

	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