diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-22 20:59:21 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-22 20:59:21 -0200 |
| commit | 7a8fd78dab48f8bf00654b303fb9bc86e4fa28b9 (patch) | |
| tree | 97e5225cb20e188c19c377d1f115e4ae1f37f34a /linux/drivers/media/video/cx18/cx18-firmware.c | |
| parent | e7ada1bf7bbfdee58d7637d9716fdd8d8b76e4a7 (diff) | |
| parent | de00985e053e5742126ccd5299ac49047fecec88 (diff) | |
| download | mediapointer-dvb-s2-7a8fd78dab48f8bf00654b303fb9bc86e4fa28b9.tar.gz mediapointer-dvb-s2-7a8fd78dab48f8bf00654b303fb9bc86e4fa28b9.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-firmware.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-firmware.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-firmware.c b/linux/drivers/media/video/cx18/cx18-firmware.c index 1fa95da15..aa89bee65 100644 --- a/linux/drivers/media/video/cx18/cx18-firmware.c +++ b/linux/drivers/media/video/cx18/cx18-firmware.c @@ -107,7 +107,7 @@ static int load_cpu_fw_direct(const char *fn, u8 __iomem *mem, struct cx18 *cx) u32 __iomem *dst = (u32 __iomem *)mem; const u32 *src; - if (request_firmware(&fw, fn, &cx->dev->dev)) { + if (request_firmware(&fw, fn, &cx->pci_dev->dev)) { CX18_ERR("Unable to open firmware %s\n", fn); CX18_ERR("Did you put the firmware in the hotplug firmware directory?\n"); return -ENOMEM; @@ -151,7 +151,7 @@ static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx, u32 apu_version = 0; int sz; - if (request_firmware(&fw, fn, &cx->dev->dev)) { + if (request_firmware(&fw, fn, &cx->pci_dev->dev)) { CX18_ERR("unable to open firmware %s\n", fn); CX18_ERR("did you put the firmware in the hotplug firmware directory?\n"); cx18_setup_page(cx, 0); |