summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-11-04 14:31:12 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-11-04 14:31:12 -0200
commit87a688a17ae8f82d48dd8833ed0eb29ecba1183c (patch)
treec65044f2d92ddab4fdb8d56bfda831307bde74a8 /linux/drivers/media/video/pvrusb2/pvrusb2-main.c
parent09569d7cdf845441f5d37be1a42c1ef0fe84a61d (diff)
parent1dbbdee4213114f49f8fe0d92a6daeba5c6f639f (diff)
downloadmediapointer-dvb-s2-87a688a17ae8f82d48dd8833ed0eb29ecba1183c.tar.gz
mediapointer-dvb-s2-87a688a17ae8f82d48dd8833ed0eb29ecba1183c.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/tda8295
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-main.c')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-main.c b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
index 73be66dd3..687096d1f 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -140,14 +140,13 @@ static int __init pvr_init(void)
static void __exit pvr_exit(void)
{
-
pvr2_trace(PVR2_TRACE_INIT,"pvr_exit");
+ usb_deregister(&pvr_driver);
+
#ifdef CONFIG_VIDEO_PVRUSB2_SYSFS
pvr2_sysfs_class_destroy(class_ptr);
#endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */
-
- usb_deregister(&pvr_driver);
}
module_init(pvr_init);