From 3bf36d231bf64f67f1aaaee5efb282fa9fa4f48e Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Wed, 26 Sep 2012 12:32:02 -0500
Subject: [PATCH] --- yaml --- r: 328383 b: refs/heads/master c:
 2d838bb608e2d1f6cb4280e76748cb812dc822e7 h: refs/heads/master i:   328381:
 9b3c4a098d74f5204436db5866286e64fd2b7b6a   328379:
 cca4538039905d7ad9a1b3ba349f5483bc975d50   328375:
 6c99a8e5a8e19be566b236bdf80b6e3f3fdbcb89   328367:
 b80958e9f7533e8efee0281cc2048ab79d30b537   328351:
 0ac31e065ef43958023046791659da64b4e05f53   328319:
 5b6bc56cffff3cb229646b544f615dea4f0f10b7 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/b43legacy/main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d94eef4d94c5..d8dcfeaaa12c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a73f507cf51a6a9e327fd9e36690072c657d36e
+refs/heads/master: 2d838bb608e2d1f6cb4280e76748cb812dc822e7
diff --git a/trunk/drivers/net/wireless/b43legacy/main.c b/trunk/drivers/net/wireless/b43legacy/main.c
index 291cdf654088..18e208e3eca1 100644
--- a/trunk/drivers/net/wireless/b43legacy/main.c
+++ b/trunk/drivers/net/wireless/b43legacy/main.c
@@ -3895,6 +3895,8 @@ static void b43legacy_remove(struct ssb_device *dev)
 	cancel_work_sync(&wl->firmware_load);
 
 	B43legacy_WARN_ON(!wl);
+	if (!wldev->fw.ucode)
+		return;			/* NULL if fw never loaded */
 	if (wl->current_dev == wldev)
 		ieee80211_unregister_hw(wl->hw);