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

Commit 68c16a76 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] si2168: enhance firmware download routine 



All known old firmware firmware formats are downloaded using 8 byte
chunks. Reject firmware if it could not be divided to 8 byte chunks
and because of that we could simplify some calculations. Now both
supported firmware download routines are rather similar.

Cc: Olli Salonen <olli.salonen@iki.fi>
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1ee5e7dd

drivers/media/dvb-frontends/si2168.c

+15 −19
Original line number Diff line number Diff line
@@ -348,7 +348,6 @@ static int si2168_init(struct dvb_frontend *fe) 
	int ret, len, remaining;

	const struct firmware *fw = NULL;

	u8 *fw_file;

	const unsigned int i2c_wr_max = 8;

	struct si2168_cmd cmd;

	unsigned int chip_id;
@@ -459,31 +458,28 @@ static int si2168_init(struct dvb_frontend *fe) 
			cmd.wlen = len;

			cmd.rlen = 1;

			ret = si2168_cmd_execute(client, &cmd);

			if (ret) {

				dev_err(&client->dev,

						"firmware download failed=%d\n",

						ret);

				goto err_release_firmware;

			}

			if (ret)

				break;

		}

	} else {

	} else if (fw->size % 8 == 0) {

		/* firmware is in the old format */

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

			len = remaining;

			if (len > i2c_wr_max)

				len = i2c_wr_max;



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

			len = 8;

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

			cmd.wlen = len;

			cmd.rlen = 1;

			ret = si2168_cmd_execute(client, &cmd);

			if (ret) {

				dev_err(&client->dev,

						"firmware download failed=%d\n",

						ret);

				goto err_release_firmware;

			if (ret)

				break;

		}

	} else {

		/* bad or unknown firmware format */

		ret = -EINVAL;

	}



	if (ret) {

		dev_err(&client->dev, "firmware download failed %d\n", ret);

		goto err_release_firmware;

	}



	release_firmware(fw);