summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/stv680.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-20 11:31:39 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-23 21:42:49 +0200
commit5e85e732f0ed56aa97a3ba26ac2b93ffe597a208 (patch)
tree899da0a99112d5e1b66d49d8561680f716798541 /drivers/media/video/stv680.c
parentV4L/DVB (8427): videodev: split off the ioctl handling into v4l2-ioctl.c (diff)
downloadlinux-5e85e732f0ed56aa97a3ba26ac2b93ffe597a208.tar.xz
linux-5e85e732f0ed56aa97a3ba26ac2b93ffe597a208.zip
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/stv680.c')
-rw-r--r--drivers/media/video/stv680.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index d7f130bedb5f..27e2f4aac13d 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -1454,7 +1454,7 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id
goto error;
}
memcpy(stv680->vdev, &stv680_template, sizeof(stv680_template));
- stv680->vdev->dev = &intf->dev;
+ stv680->vdev->parent = &intf->dev;
video_set_drvdata(stv680->vdev, stv680);
memcpy (stv680->vdev->name, stv680->camera_name, strlen (stv680->camera_name));