summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/drx397xD.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2009-04-26 05:43:59 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-16 18:20:56 -0300
commite9785250ef2eead8bd5e9166679c0be0595df387 (patch)
tree8bc16b02d4f80206190183e7a9d3224395e9203a /drivers/media/dvb/frontends/drx397xD.c
parentf8eaaf4f2a2810d6e486da2916ef07f7e00665c9 (diff)
downloadop-kernel-dev-e9785250ef2eead8bd5e9166679c0be0595df387.zip
op-kernel-dev-e9785250ef2eead8bd5e9166679c0be0595df387.tar.gz
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: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/frontends/drx397xD.c')
-rw-r--r--drivers/media/dvb/frontends/drx397xD.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
index 172f1f9..0100755 100644
--- a/drivers/media/dvb/frontends/drx397xD.c
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -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;
}
OpenPOWER on IntegriCloud