summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-main.c
diff options
context:
space:
mode:
authorMichael Krufky2008-02-04 03:46:16 +0100
committerMauro Carvalho Chehab2008-04-24 19:09:46 +0200
commit04910bdc5c172af9bc937a8869e7f2907db4443f (patch)
treeb8b5f224510cca9938f2f766905622632f0f4861 /drivers/media/video/pvrusb2/pvrusb2-main.c
parentV4L/DVB (7678): pvrusb2: Fix stupid string typo that has been reproducing wildly (diff)
downloadkernel-qcow2-linux-04910bdc5c172af9bc937a8869e7f2907db4443f.tar.gz
kernel-qcow2-linux-04910bdc5c172af9bc937a8869e7f2907db4443f.tar.xz
kernel-qcow2-linux-04910bdc5c172af9bc937a8869e7f2907db4443f.zip
V4L/DVB (7679): pvrusb2: add DVB API framework
Add basic framework for the DVB API. This is enough to control the tuner & demod of the digital frontend, but the stream & buffer handling is still missing. Additional note from Mike Isely <isely@pobox.com> - also, since these changes are still very experimental arrange for DVB changes to be compiled in via new CONFIG_VIDEO_PVRUSB2_DVB option, for now. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-main.c')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c
index b63b2265503a..68f4a7480737 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -60,6 +60,10 @@ static void pvr_setup_attach(struct pvr2_context *pvr)
{
/* Create association with v4l layer */
pvr2_v4l2_create(pvr);
+#ifdef CONFIG_VIDEO_PVRUSB2_DVB
+ /* Create association with dvb layer */
+ pvr2_dvb_init(pvr);
+#endif
#ifdef CONFIG_VIDEO_PVRUSB2_SYSFS
pvr2_sysfs_create(pvr,class_ptr);
#endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */
@@ -95,6 +99,9 @@ static void pvr_disconnect(struct usb_interface *intf)
pvr2_trace(PVR2_TRACE_INIT,"pvr_disconnect(pvr=%p) BEGIN",pvr);
+#ifdef CONFIG_VIDEO_PVRUSB2_DVB
+ pvr2_dvb_exit(pvr);
+#endif
usb_set_intfdata (intf, NULL);
pvr2_context_disconnect(pvr);