The patch number 11229 was added via Janne Grunau <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Janne Grunau <[email protected]>
hdpvr: set usb interface dev as parent in struct video_device
Priority: normal
Signed-off-by: Janne Grunau <[email protected]>
---
linux/drivers/media/video/hdpvr/hdpvr-core.c | 2 +-
linux/drivers/media/video/hdpvr/hdpvr-video.c | 5 +++--
linux/drivers/media/video/hdpvr/hdpvr.h | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff -r 1b125b336e11 -r 513c90084f6f
linux/drivers/media/video/hdpvr/hdpvr-core.c
--- a/linux/drivers/media/video/hdpvr/hdpvr-core.c Fri Mar 27 00:29:39
2009 +0100
+++ b/linux/drivers/media/video/hdpvr/hdpvr-core.c Thu Mar 26 18:40:55
2009 +0100
@@ -342,7 +342,7 @@ static int hdpvr_probe(struct usb_interf
}
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;
diff -r 1b125b336e11 -r 513c90084f6f
linux/drivers/media/video/hdpvr/hdpvr-video.c
--- a/linux/drivers/media/video/hdpvr/hdpvr-video.c Fri Mar 27 00:29:39
2009 +0100
+++ b/linux/drivers/media/video/hdpvr/hdpvr-video.c Thu Mar 26 18:40:55
2009 +0100
@@ -1193,7 +1193,8 @@ static const struct video_device hdpvr_v
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
*(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)) {
diff -r 1b125b336e11 -r 513c90084f6f linux/drivers/media/video/hdpvr/hdpvr.h
--- a/linux/drivers/media/video/hdpvr/hdpvr.h Fri Mar 27 00:29:39 2009 +0100
+++ b/linux/drivers/media/video/hdpvr/hdpvr.h Thu Mar 26 18:40:55 2009 +0100
@@ -284,7 +284,8 @@ int get_input_lines_info(struct hdpvr_de
/*========================================================================*/
/* 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);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/513c90084f6f1914aab6546f90ea0c700f12d0d4
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
