git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (7679): pvrusb2: add DVB API framework
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
pvrusb2
/
pvrusb2-main.c
diff --git
a/drivers/media/video/pvrusb2/pvrusb2-main.c
b/drivers/media/video/pvrusb2/pvrusb2-main.c
index b63b2265503ac174a335e1ca23c5a560e8d1c31c..68f4a748073702862283433add49e8ce3b766c52 100644
(file)
--- 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);
{
/* 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 */
#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);
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);
usb_set_intfdata (intf, NULL);
pvr2_context_disconnect(pvr);