Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.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 8689ddb54420d05c0fb3b4e428aff6647a5ab719..2254194aad579c201475784f7c27a51e7be6791d 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -21,7 +21,6 @@
 
 #include <linux/kernel.h>
 #include <linux/errno.h>
-#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/videodev2.h>
@@ -154,12 +153,12 @@ static void __exit pvr_exit(void)
 
        usb_deregister(&pvr_driver);
 
+       pvr2_context_global_done();
+
 #ifdef CONFIG_VIDEO_PVRUSB2_SYSFS
        pvr2_sysfs_class_destroy(class_ptr);
 #endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */
 
-       pvr2_context_global_done();
-
        pvr2_trace(PVR2_TRACE_INIT,"pvr_exit complete");
 }