Commit e9785250 authored by Jean Delvare's avatar Jean Delvare Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11723): Link firmware to physical device 



Use the physical device rather than the i2c adapter as the reference
device when loading firmwares. This will prevent the sysfs name
collision with i2c-dev that has been reported many times.

I may have missed other drivers which need the same fix.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f8eaaf4f

drivers/media/common/tuners/tuner-xc2028.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static int load_all_firmwares(struct dvb_frontend *fe) 
		fname = firmware_name;



	tuner_dbg("Reading firmware %s\n", fname);

	rc = request_firmware(&fw, fname, &priv->i2c_props.adap->dev);

	rc = request_firmware(&fw, fname, priv->i2c_props.adap->dev.parent);

	if (rc < 0) {

		if (rc == -ENOENT)

			tuner_err("Error: firmware %s not found.\n",

drivers/media/common/tuners/xc5000.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static int xc5000_fwupload(struct dvb_frontend *fe) 
		XC5000_DEFAULT_FIRMWARE);



	ret = request_firmware(&fw, XC5000_DEFAULT_FIRMWARE,

		&priv->i2c_props.adap->dev);

		priv->i2c_props.adap->dev.parent);

	if (ret) {

		printk(KERN_ERR "xc5000: Upload failed. (file not found?)\n");

		ret = XC_RESULT_RESET_FAILURE;

drivers/media/dvb/frontends/af9013.c

+1 −1
Original line number Diff line number Diff line
@@ -1455,7 +1455,7 @@ static int af9013_download_firmware(struct af9013_state *state) 
		af9013_ops.info.name);



	/* request the firmware, this will block and timeout */

	ret = request_firmware(&fw, fw_file,  &state->i2c->dev);

	ret = request_firmware(&fw, fw_file, state->i2c->dev.parent);

	if (ret) {

		err("did not find the firmware file. (%s) "

			"Please see linux/Documentation/dvb/ for more details" \

drivers/media/dvb/frontends/cx24116.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static int cx24116_firmware_ondemand(struct dvb_frontend *fe) 
		printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n",

			__func__, CX24116_DEFAULT_FIRMWARE);

		ret = request_firmware(&fw, CX24116_DEFAULT_FIRMWARE,

			&state->i2c->dev);

			state->i2c->dev.parent);

		printk(KERN_INFO "%s: Waiting for firmware upload(2)...\n",

			__func__);

		if (ret) {

drivers/media/dvb/frontends/drx397xD.c

+2 −2
Original line number Diff line number Diff line
@@ -123,10 +123,10 @@ static int drx_load_fw(struct drx397xD_state *s, enum fw_ix ix) 
	}

	memset(&fw[ix].data[0], 0, sizeof(fw[0].data));



	if (request_firmware(&fw[ix].file, fw[ix].name, &s->i2c->dev) != 0) {

	rc = request_firmware(&fw[ix].file, fw[ix].name, s->i2c->dev.parent);

	if (rc != 0) {

		printk(KERN_ERR "%s: Firmware \"%s\" not available\n",

		       mod_name, fw[ix].name);

		rc = -ENOENT;

		goto exit_err;

	}