summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorJanne Grunau <j@jannau.net>2009-03-27 20:01:40 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:43:43 -0300
commit06630aec92d6a71658ac1538e2a65af5cfc5f2af (patch)
treea765950e5ad32466fee4585c2e9bf3766951a118 /drivers/media/video
parent0b61dca28909bc548581bec75e3b90faaa7f11fd (diff)
downloadblackbird-op-linux-06630aec92d6a71658ac1538e2a65af5cfc5f2af.tar.gz
blackbird-op-linux-06630aec92d6a71658ac1538e2a65af5cfc5f2af.zip
V4L/DVB (11245): hdpvr: add struct v4l2_device
Signed-off-by: Janne Grunau <j@jannau.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/hdpvr/hdpvr-core.c9
-rw-r--r--drivers/media/video/hdpvr/hdpvr.h4
2 files changed, 13 insertions, 0 deletions
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
index 547833eb6cec..3b19a259dc4e 100644
--- a/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/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/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
index 3af415d81df7..1edd8759121e 100644
--- a/drivers/media/video/hdpvr/hdpvr.h
+++ b/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;
OpenPOWER on IntegriCloud