From a944a401b927d172ab3011ca7b3ade8c23c34287 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Sat, 27 Aug 2011 15:53:42 -0500
Subject: [PATCH] --- yaml --- r: 265900 b: refs/heads/master c:
 9a53bf54b8149bc1372f50a83b769f42772083ea h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/wireless/b43/main.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e8a4b5289fc4..bc5b6ce97fc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ba45b9e3a366fee0603cda51e61935b7dc9db7d
+refs/heads/master: 9a53bf54b8149bc1372f50a83b769f42772083ea
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index d2b1d1fe202b..172294170df8 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/drivers/net/wireless/b43/main.c
@@ -4131,10 +4131,13 @@ static void b43_op_configure_filter(struct ieee80211_hw *hw,
  * because the core might be gone away while we unlocked the mutex. */
 static struct b43_wldev * b43_wireless_core_stop(struct b43_wldev *dev)
 {
-	struct b43_wl *wl = dev->wl;
+	struct b43_wl *wl;
 	struct b43_wldev *orig_dev;
 	u32 mask;
 
+	if (!dev)
+		return NULL;
+	wl = dev->wl;
 redo:
 	if (!dev || b43_status(dev) < B43_STAT_STARTED)
 		return dev;