From: Mike Isely <isely@pobox.com>
Date: Sun, 9 Sep 2007 01:10:11 +0000 (-0300)
Subject: V4L/DVB (6205): pvrusb2: Fix oops in error leg cleanup
X-Git-Tag: v2.6.24-rc1~1463^2~88
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=747f07961e9450058522840129cd7bb994f05fb9;p=linux-2.6

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 6bbed88d78..22719ba861 100644
--- 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);
 }