aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/usbvideo
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-20 05:31:39 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-23 15:42:49 -0400
commit5e85e732f0ed56aa97a3ba26ac2b93ffe597a208 (patch)
tree899da0a99112d5e1b66d49d8561680f716798541 /drivers/media/video/usbvideo
parent27a5e6d3fcce73ceeee8f3bdc9a30c4564233800 (diff)
V4L/DVB (8428): videodev: rename 'dev' to 'parent'
The field 'dev' is not the video device, but the parent of the video device. Rename accordingly. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/usbvideo')
-rw-r--r--drivers/media/video/usbvideo/usbvideo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index 4128ee20b64e..7e6ab2910c13 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -1040,7 +1040,7 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
1040 err("%s: uvd->dev == NULL", __func__); 1040 err("%s: uvd->dev == NULL", __func__);
1041 return -EINVAL; 1041 return -EINVAL;
1042 } 1042 }
1043 uvd->vdev.dev = &uvd->dev->dev; 1043 uvd->vdev.parent = &uvd->dev->dev;
1044 if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) { 1044 if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
1045 err("%s: video_register_device failed", __func__); 1045 err("%s: video_register_device failed", __func__);
1046 return -EPIPE; 1046 return -EPIPE;