V4L/DVB (6205): pvrusb2: Fix oops in error leg cleanup

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c b/drivers/media/video/pvrusb2/pvrusb2-context.c
index 6bbed88d7867af00ae9de1cafe2751ec35d56bee..22719ba861aceb2d0e0c3f2b70b467b39ef26de9 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-context.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-context.c
@@ -33,8 +33,10 @@ static void pvr2_context_destroy(struct pvr2_context *mp)
 {
        if (mp->hdw) pvr2_hdw_destroy(mp->hdw);
        pvr2_trace(PVR2_TRACE_STRUCT,"Destroying pvr_main id=%p",mp);
-       flush_workqueue(mp->workqueue);
-       destroy_workqueue(mp->workqueue);
+       if (mp->workqueue) {
+               flush_workqueue(mp->workqueue);
+               destroy_workqueue(mp->workqueue);
+       }
        kfree(mp);
 }