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

Commit 7d6bc608 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] si2157: rework firmware download logic a little bit 



Rework firmware selection / chip detection logic a little bit.
Add missing release_firmware() to error path.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Tested-by: default avatarOlli Salonen <olli.salonen@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent b6b6fd6f

drivers/media/tuners/si2157.c

+58 −50
Original line number Diff line number Diff line
@@ -82,11 +82,11 @@ static int si2157_cmd_execute(struct si2157 *s, struct si2157_cmd *cmd) 
static int si2157_init(struct dvb_frontend *fe)

{

	struct si2157 *s = fe->tuner_priv;

	int ret, remaining;

	int ret, len, remaining;

	struct si2157_cmd cmd;

	u8 chip, len = 0;

	const struct firmware *fw = NULL;

	u8 *fw_file;

	unsigned int chip_id;



	dev_dbg(&s->client->dev, "%s:\n", __func__);
@@ -106,17 +106,24 @@ static int si2157_init(struct dvb_frontend *fe) 
	if (ret)

		goto err;



	chip = cmd.args[2]; /* 57 for Si2157, 58 for Si2158 */

	chip_id = cmd.args[1] << 24 | cmd.args[2] << 16 | cmd.args[3] << 8 |

			cmd.args[4] << 0;



	/* Si2158 requires firmware download */

	if (chip == 58) {

		if (((cmd.args[1] & 0x0f) == 1) && (cmd.args[3] == '2') &&

				(cmd.args[4] == '0'))

	#define SI2158_A20 ('A' << 24 | 58 << 16 | '2' << 8 | '0' << 0)

	#define SI2157_A30 ('A' << 24 | 57 << 16 | '3' << 8 | '0' << 0)



	switch (chip_id) {

	case SI2158_A20:

		fw_file = SI2158_A20_FIRMWARE;

		else {

		break;

	case SI2157_A30:

		goto skip_fw_download;

		break;

	default:

		dev_err(&s->client->dev,

					"%s: no firmware file for Si%d-%c%c defined\n",

					KBUILD_MODNAME, chip, cmd.args[3], cmd.args[4]);

				"%s: unkown chip version Si21%d-%c%c%c\n",

				KBUILD_MODNAME, cmd.args[2], cmd.args[1],

				cmd.args[3], cmd.args[4]);

		ret = -EINVAL;

		goto err;

	}
@@ -133,9 +140,6 @@ static int si2157_init(struct dvb_frontend *fe) 
		goto err;

	}



		dev_info(&s->client->dev, "%s: downloading firmware from file '%s'\n",

				KBUILD_MODNAME, fw_file);



	/* firmware should be n chunks of 17 bytes */

	if (fw->size % 17 != 0) {

		dev_err(&s->client->dev, "%s: firmware file '%s' is invalid\n",
@@ -144,10 +148,12 @@ static int si2157_init(struct dvb_frontend *fe) 
		goto err;

	}



	dev_info(&s->client->dev, "%s: downloading firmware from file '%s'\n",

			KBUILD_MODNAME, fw_file);



	for (remaining = fw->size; remaining > 0; remaining -= 17) {

			memcpy(&len, &fw->data[fw->size - remaining], 1);

			memcpy(cmd.args, &fw->data[(fw->size - remaining) + 1],

					len);

		len = fw->data[fw->size - remaining];

		memcpy(cmd.args, &fw->data[(fw->size - remaining) + 1], len);

		cmd.wlen = len;

		cmd.rlen = 1;

		ret = si2157_cmd_execute(s, &cmd);
@@ -162,8 +168,7 @@ static int si2157_init(struct dvb_frontend *fe) 
	release_firmware(fw);

	fw = NULL;



	}



skip_fw_download:

	/* reboot the tuner with new firmware? */

	memcpy(cmd.args, "\x01\x01", 2);

	cmd.wlen = 2;
@@ -176,6 +181,9 @@ static int si2157_init(struct dvb_frontend *fe) 


	return 0;

err:

	if (fw)

		release_firmware(fw);



	dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);

	return ret;

}