From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue, 23 Dec 2008 10:35:45 +0000 (-0300)
Subject: V4L/DVB (9975): ivtv: set v4l2_dev instead of parent.
X-Git-Tag: v2.6.29-rc1~556^2~131
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4efc9abfde232a74ed1a4c2c1f797bdacf7bda53;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 76279ed30da..f77d764707b 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;