---

yaml --- r: 328383 b: refs/heads/master c: 2d838bb h: refs/heads/master i: 328381: 9b3c4a0 328379: cca4538 328375: 6c99a8e 328367: b80958e 328351: 0ac31e0 328319: 5b6bc56 v: v3
git-mirror · Sep 28, 2012 · 3bf36d2 · 3bf36d2
1 parent 64d2504
commit 3bf36d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);