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

Commit 92a37438 authored by Jeffrey Lin's avatar Jeffrey Lin Committed by Dmitry Torokhov
Browse files

Input: raydium_i2c_ts - include hardware version in firmware name 



Add hardware version to the firmware file name to handle scenarios where
single system image supports variety of devices.

Signed-off-by: default avatarJeffrey Lin <jeffrey.lin@rad-ic.com>
Patchwork-Id: 10127677
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent b8af0b5b

drivers/input/touchscreen/raydium_i2c_ts.c

+12 −2
Original line number Diff line number Diff line
@@ -752,13 +752,20 @@ static int raydium_i2c_fw_update(struct raydium_data *ts) 
{

	struct i2c_client *client = ts->client;

	const struct firmware *fw = NULL;

	const char *fw_file = "raydium.fw";

	char *fw_file;

	int error;



	fw_file = kasprintf(GFP_KERNEL, "raydium_%#04x.fw",

			    le32_to_cpu(ts->info.hw_ver));

	if (!fw_file)

		return -ENOMEM;



	dev_dbg(&client->dev, "firmware name: %s\n", fw_file);



	error = request_firmware(&fw, fw_file, &client->dev);

	if (error) {

		dev_err(&client->dev, "Unable to open firmware %s\n", fw_file);

		return error;

		goto out_free_fw_file;

	}



	disable_irq(client->irq);
@@ -787,6 +794,9 @@ static int raydium_i2c_fw_update(struct raydium_data *ts) 


	release_firmware(fw);



out_free_fw_file:

	kfree(fw_file);



	return error;

}