From ae2c922890e30f391accb487b7b7a576161bc61c Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Fri, 27 Mar 2009 20:01:40 -0300
Subject: [PATCH] --- yaml --- r: 138343 b: refs/heads/master c:
 06630aec92d6a71658ac1538e2a65af5cfc5f2af h: refs/heads/master i:   138341:
 74de1fff4534ac5e366e6e0b78d54a79bfb2cd64   138339:
 7dc0a66f416f701e900d4cf68ea558b541f6fb0b   138335:
 6d7e685b72044c8c2514034904c1212598b9f93c v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/hdpvr/hdpvr-core.c | 9 +++++++++
 trunk/drivers/media/video/hdpvr/hdpvr.h      | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 173825d4a9ab..a5625ea23537 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b61dca28909bc548581bec75e3b90faaa7f11fd
+refs/heads/master: 06630aec92d6a71658ac1538e2a65af5cfc5f2af
diff --git a/trunk/drivers/media/video/hdpvr/hdpvr-core.c b/trunk/drivers/media/video/hdpvr/hdpvr-core.c
index 547833eb6cec..3b19a259dc4e 100644
--- a/trunk/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/trunk/drivers/media/video/hdpvr/hdpvr-core.c
@@ -278,6 +278,13 @@ static int hdpvr_probe(struct usb_interface *interface,
 		err("Out of memory");
 		goto error;
 	}
+
+	/* register v4l2_device early so it can be used for printks */
+	if (v4l2_device_register(&interface->dev, &dev->v4l2_dev)) {
+		err("v4l2_device_register failed");
+		goto error;
+	}
+
 	mutex_init(&dev->io_mutex);
 	mutex_init(&dev->i2c_mutex);
 	mutex_init(&dev->usbc_mutex);
@@ -387,6 +394,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
 	/* prevent more I/O from starting and stop any ongoing */
 	mutex_lock(&dev->io_mutex);
 	dev->status = STATUS_DISCONNECTED;
+	v4l2_device_disconnect(&dev->v4l2_dev);
 	video_unregister_device(dev->video_dev);
 	wake_up_interruptible(&dev->wait_data);
 	wake_up_interruptible(&dev->wait_buffer);
@@ -413,6 +421,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
 	printk(KERN_INFO "Hauppauge HD PVR: device /dev/video%d disconnected\n",
 	       minor);
 
+	v4l2_device_unregister(&dev->v4l2_dev);
 	kfree(dev->usbc_buf);
 	kfree(dev);
 }
diff --git a/trunk/drivers/media/video/hdpvr/hdpvr.h b/trunk/drivers/media/video/hdpvr/hdpvr.h
index 3af415d81df7..1edd8759121e 100644
--- a/trunk/drivers/media/video/hdpvr/hdpvr.h
+++ b/trunk/drivers/media/video/hdpvr/hdpvr.h
@@ -15,6 +15,8 @@
 #include <linux/workqueue.h>
 #include <linux/videodev2.h>
 
+#include <media/v4l2-device.h>
+
 #define HDPVR_MAJOR_VERSION 0
 #define HDPVR_MINOR_VERSION 2
 #define HDPVR_RELEASE 0
@@ -65,6 +67,8 @@ struct hdpvr_device {
 	struct video_device	*video_dev;
 	/* the usb device for this device */
 	struct usb_device	*udev;
+	/* v4l2-device unused */
+	struct v4l2_device	v4l2_dev;
 
 	/* the max packet size of the bulk endpoint */
 	size_t			bulk_in_size;