aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-main.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2008-02-09 13:44:30 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:09:46 -0400
commit891d99efc5be16d2762bdbb9d0486f7250990eee (patch)
tree42bf20210b0c44a43943b90acb8edae50f7ce4e2 /drivers/media/video/pvrusb2/pvrusb2-main.c
parenta36416d0a70899d3724d2e69e378062e06252a41 (diff)
V4L/DVB (7689): pvrusb2-dvb: Rework module tear-down
Rather than making an explicit call to tear down the pvrusb2-dvb module, use the callback in the pvr2_channel structure. This has the advantage that now tear-down only happens when it makes sense. The previous implementation had scenarios where it was possible for the tear-down call to happen without a prior initialization. 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.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c
index 68f4a7480737..42b4c8d5a1ed 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -99,9 +99,6 @@ static void pvr_disconnect(struct usb_interface *intf)
99 99
100 pvr2_trace(PVR2_TRACE_INIT,"pvr_disconnect(pvr=%p) BEGIN",pvr); 100 pvr2_trace(PVR2_TRACE_INIT,"pvr_disconnect(pvr=%p) BEGIN",pvr);
101 101
102#ifdef CONFIG_VIDEO_PVRUSB2_DVB
103 pvr2_dvb_exit(pvr);
104#endif
105 usb_set_intfdata (intf, NULL); 102 usb_set_intfdata (intf, NULL);
106 pvr2_context_disconnect(pvr); 103 pvr2_context_disconnect(pvr);
107 104