aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/cx24116.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/cx24116.c
parentV4L/DVB (11720): gspca - sonixj: Webcam 06f8:3008 added (diff)
downloadlinux-dev-e9785250ef2eead8bd5e9166679c0be0595df387.tar.xz
linux-dev-e9785250ef2eead8bd5e9166679c0be0595df387.zip
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/cx24116.c')
-rw-r--r--drivers/media/dvb/frontends/cx24116.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c
index 9b9f57264cef..2410d8b59b6b 100644
--- a/drivers/media/dvb/frontends/cx24116.c
+++ b/drivers/media/dvb/frontends/cx24116.c
@@ -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) {