summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-12-23 11:35:45 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 12:39:36 +0100
commit4efc9abfde232a74ed1a4c2c1f797bdacf7bda53 (patch)
treec4ad245e511ea5e0e0ba3020c2590c48563b1e34 /drivers/media/video/ivtv
parentV4L/DVB (9974): v4l2-dev: allow drivers to pass v4l2_device as parent (diff)
downloadlinux-4efc9abfde232a74ed1a4c2c1f797bdacf7bda53.tar.xz
linux-4efc9abfde232a74ed1a4c2c1f797bdacf7bda53.zip
V4L/DVB (9975): ivtv: set v4l2_dev instead of parent.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv')
-rw-r--r--drivers/media/video/ivtv/ivtv-streams.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 76279ed30da2..f77d764707b2 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -209,7 +209,7 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
itv->device.name, s->name);
s->v4l2dev->num = num;
- s->v4l2dev->parent = &itv->dev->dev;
+ s->v4l2dev->v4l2_dev = &itv->device;
s->v4l2dev->fops = ivtv_stream_info[type].fops;
s->v4l2dev->release = video_device_release;
s->v4l2dev->tvnorms = V4L2_STD_ALL;