diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-06 14:02:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-06 14:02:16 +1100 |
| commit | 42c191834ee7c77da55c6089177d6be2b3b2bc23 (patch) | |
| tree | 993ba233bab96825bdc7c87e9360046ed9f3f707 /drivers/media/video/cx18/cx18-firmware.c | |
| parent | 5e63a81a756f0723bb0ee8b5a8c07469c68fd79a (diff) | |
| parent | b85f8e6623ad0f2cc42e51235db1d487fb8ee4c2 (diff) | |
Merge commit 'v4l-dvb/master'
Diffstat (limited to 'drivers/media/video/cx18/cx18-firmware.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-firmware.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c index 1fa95da1575e..aa89bee65af0 100644 --- a/drivers/media/video/cx18/cx18-firmware.c +++ b/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); |