diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-14 08:36:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-14 08:36:50 -0300 |
| commit | f73d4223cf12d0d65a3bd9d6da0ff8807c86d064 (patch) | |
| tree | 69f2f087b6053c218a8f5431f56aff437c8ee538 /linux/drivers/media/dvb/frontends/nxt200x.c | |
| parent | 7e2fc0b0dd4648fcd4c2ca82093aebcfaed3e863 (diff) | |
| parent | bdef8c3d9a3ba2fab464529580ae8028d74e8aff (diff) | |
| download | mediapointer-dvb-s2-f73d4223cf12d0d65a3bd9d6da0ff8807c86d064.tar.gz mediapointer-dvb-s2-f73d4223cf12d0d65a3bd9d6da0ff8807c86d064.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/k2c2
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/nxt200x.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/nxt200x.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/frontends/nxt200x.c b/linux/drivers/media/dvb/frontends/nxt200x.c index 846350bc4..748f95b22 100644 --- a/linux/drivers/media/dvb/frontends/nxt200x.c +++ b/linux/drivers/media/dvb/frontends/nxt200x.c @@ -880,7 +880,8 @@ static int nxt2002_init(struct dvb_frontend* fe) /* request the firmware, this will block until someone uploads it */ printk("nxt2002: Waiting for firmware upload (%s)...\n", NXT2002_DEFAULT_FIRMWARE); - ret = request_firmware(&fw, NXT2002_DEFAULT_FIRMWARE, &state->i2c->dev); + ret = request_firmware(&fw, NXT2002_DEFAULT_FIRMWARE, + state->i2c->dev.parent); printk("nxt2002: Waiting for firmware upload(2)...\n"); if (ret) { printk("nxt2002: No firmware uploaded (timeout or file not found?)\n"); @@ -944,7 +945,8 @@ static int nxt2004_init(struct dvb_frontend* fe) /* request the firmware, this will block until someone uploads it */ printk("nxt2004: Waiting for firmware upload (%s)...\n", NXT2004_DEFAULT_FIRMWARE); - ret = request_firmware(&fw, NXT2004_DEFAULT_FIRMWARE, &state->i2c->dev); + ret = request_firmware(&fw, NXT2004_DEFAULT_FIRMWARE, + state->i2c->dev.parent); printk("nxt2004: Waiting for firmware upload(2)...\n"); if (ret) { printk("nxt2004: No firmware uploaded (timeout or file not found?)\n"); |