redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Janne Grunau 2009-03-26 14:40:55 -03:00 committed by Mauro Carvalho Chehab
parent d211bfcbd0
commit a50ab29185
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/hdpvr/hdpvr-core.c
View File

@ -342,7 +342,7 @@ static int hdpvr_probe(struct usb_interface *interface,
}
mutex_unlock(&dev->io_mutex);
if (hdpvr_register_videodev(dev,
if (hdpvr_register_videodev(dev, &interface->dev,
video_nr[atomic_inc_return(&dev_nr)])) {
err("registering videodev failed");
goto error;

5
drivers/media/video/hdpvr/hdpvr-video.c
View File

@ -1193,7 +1193,8 @@ static const struct video_device hdpvr_video_template = {
V4L2_STD_PAL_60,
};
int hdpvr_register_videodev(struct hdpvr_device *dev, int devnum)
int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent,
int devnum)
{
/* setup and register video device */
dev->video_dev = video_device_alloc();
@ -1204,7 +1205,7 @@ int hdpvr_register_videodev(struct hdpvr_device *dev, int devnum)
*(dev->video_dev) = hdpvr_video_template;
strcpy(dev->video_dev->name, "Hauppauge HD PVR");
dev->video_dev->parent = &dev->udev->dev;
dev->video_dev->parent = parent;
video_set_drvdata(dev->video_dev, dev);
if (video_register_device(dev->video_dev, VFL_TYPE_GRABBER, devnum)) {

3
drivers/media/video/hdpvr/hdpvr.h
View File

@ -284,7 +284,8 @@ int get_input_lines_info(struct hdpvr_device *dev);
/*========================================================================*/
/* v4l2 registration */
int hdpvr_register_videodev(struct hdpvr_device *dev, int devnumber);
int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent,
int devnumber);
int hdpvr_cancel_queue(struct hdpvr_device *dev);