From 1cacd034bcbb88622fd41d9d58d7dae187e0a7a4 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 16 Feb 2012 20:44:59 +0100
Subject: [PATCH] --- yaml --- r: 288207 b: refs/heads/master c:
 7be081539e540517d5e1fcbf96b8080074afbf08 h: refs/heads/master i:   288205:
 d74ea9c8de38d1e1f54514c385ab3ae4c8cecab3   288203:
 f32bc3fe41812dd99d37ef33d465c35e42b42e15   288199:
 3da37f2d6c607583dda4b0171f1bcc78491c6806   288191:
 e3453ba50121feeccce65efb7a2e10722309ba97 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2x00dev.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 91a8da21a7d1..070f2fc31043 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bbb8168ed3d8b946f9c1901a63a675012de88f2
+refs/heads/master: 7be081539e540517d5e1fcbf96b8080074afbf08
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c b/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c
index c3e1aa7c1a80..d2a1ea98d0f2 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1220,7 +1220,8 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
 		cancel_work_sync(&rt2x00dev->rxdone_work);
 		cancel_work_sync(&rt2x00dev->txdone_work);
 	}
-	destroy_workqueue(rt2x00dev->workqueue);
+	if (rt2x00dev->workqueue)
+		destroy_workqueue(rt2x00dev->workqueue);
 
 	/*
 	 * Free the tx status fifo.