diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-07 05:02:27 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:41 -0400 |
commit | 8ac05ae3192ce8a71fc84e4a88772cce0c09173c (patch) | |
tree | 997f2d8bbedf857b33bf62d44b9cc4cd8c7a9f73 /drivers/media/video/ivtv/ivtv-firmware.c | |
parent | d7493e518fa98d2c30c545c518df075903bae513 (diff) |
V4L/DVB (10488): ivtv: cleanup naming conventions
Use consistent naming for pci_dev, v4l2_device and video_device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-firmware.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-firmware.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c index 6dba55b7e25a..c1b7ec475c27 100644 --- a/drivers/media/video/ivtv/ivtv-firmware.c +++ b/drivers/media/video/ivtv/ivtv-firmware.c | |||
@@ -52,7 +52,7 @@ static int load_fw_direct(const char *fn, volatile u8 __iomem *mem, struct ivtv | |||
52 | int retries = 3; | 52 | int retries = 3; |
53 | 53 | ||
54 | retry: | 54 | retry: |
55 | if (retries && request_firmware(&fw, fn, &itv->dev->dev) == 0) { | 55 | if (retries && request_firmware(&fw, fn, &itv->pdev->dev) == 0) { |
56 | int i; | 56 | int i; |
57 | volatile u32 __iomem *dst = (volatile u32 __iomem *)mem; | 57 | volatile u32 __iomem *dst = (volatile u32 __iomem *)mem; |
58 | const u32 *src = (const u32 *)fw->data; | 58 | const u32 *src = (const u32 *)fw->data; |