aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/hdpvr/hdpvr-video.c
diff options
context:
space:
mode:
authorJanne Grunau <j@jannau.net>2009-03-26 13:40:55 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:42 -0400
commita50ab29185a9ec31e5a6999e53add0508653e889 (patch)
tree40f9a24c5396f2eb269bd24005e8e8c2b8c7dc6f /drivers/media/video/hdpvr/hdpvr-video.c
parentd211bfcbd0f13f1234aaa6e565013dba051a408c (diff)
V4L/DVB (11229): hdpvr: set usb interface dev as parent in struct video_device
Signed-off-by: Janne Grunau <j@jannau.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/hdpvr/hdpvr-video.c')
-rw-r--r--drivers/media/video/hdpvr/hdpvr-video.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
index d63bfccf784e..9560e19d7cf0 100644
--- a/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/drivers/media/video/hdpvr/hdpvr-video.c
@@ -1193,7 +1193,8 @@ static const struct video_device hdpvr_video_template = {
1193 V4L2_STD_PAL_60, 1193 V4L2_STD_PAL_60,
1194}; 1194};
1195 1195
1196int hdpvr_register_videodev(struct hdpvr_device *dev, int devnum) 1196int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent,
1197 int devnum)
1197{ 1198{
1198 /* setup and register video device */ 1199 /* setup and register video device */
1199 dev->video_dev = video_device_alloc(); 1200 dev->video_dev = video_device_alloc();
@@ -1204,7 +1205,7 @@ int hdpvr_register_videodev(struct hdpvr_device *dev, int devnum)
1204 1205
1205 *(dev->video_dev) = hdpvr_video_template; 1206 *(dev->video_dev) = hdpvr_video_template;
1206 strcpy(dev->video_dev->name, "Hauppauge HD PVR"); 1207 strcpy(dev->video_dev->name, "Hauppauge HD PVR");
1207 dev->video_dev->parent = &dev->udev->dev; 1208 dev->video_dev->parent = parent;
1208 video_set_drvdata(dev->video_dev, dev); 1209 video_set_drvdata(dev->video_dev, dev);
1209 1210
1210 if (video_register_device(dev->video_dev, VFL_TYPE_GRABBER, devnum)) { 1211 if (video_register_device(dev->video_dev, VFL_TYPE_GRABBER, devnum)) {