From 5a29f76158881b65cf8a2a386923634e5ff98c3f Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Fri, 22 Jul 2011 18:07:13 -0400
Subject: [PATCH] --- yaml --- r: 261055 b: refs/heads/master c:
 e61b52d1309df08b86a35e54a61f0cc932b28291 h: refs/heads/master i:   261053:
 ee46b515b105807fd86469c4a9a1f6b92f4d499e   261051:
 53852272d45f40b0f2257c07b41ab9b317afdddf   261047:
 094baaf57667c8379aee0acd0708d04f16409c30   261039:
 f1118e72f585928691e390773bb016d54e0a05fe   261023:
 e51c66d0e7d8940cbae6605a0e0d8b5376f74d54   260991:
 f4b7d97c30da769d5d0cda657f9cabdc2b1df412 v: v3

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

diff --git a/[refs] b/[refs]
index cabe04b95af5..daec5a4f9dce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f89062a66d8b88ca89a15a6cebc0bc0db284441
+refs/heads/master: e61b52d1309df08b86a35e54a61f0cc932b28291
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index d9f53b791b21..85d6a1f03a08 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/drivers/net/wireless/b43/main.c
@@ -5350,6 +5350,7 @@ static void b43_ssb_remove(struct ssb_device *sdev)
 {
 	struct b43_wl *wl = ssb_get_devtypedata(sdev);
 	struct b43_wldev *wldev = ssb_get_drvdata(sdev);
+	struct b43_bus_dev *dev = wldev->dev;
 
 	/* We must cancel any work here before unregistering from ieee80211,
 	 * as the ieee80211 unreg will destroy the workqueue. */
@@ -5365,14 +5366,14 @@ static void b43_ssb_remove(struct ssb_device *sdev)
 		ieee80211_unregister_hw(wl->hw);
 	}
 
-	b43_one_core_detach(wldev->dev);
+	b43_one_core_detach(dev);
 
 	if (list_empty(&wl->devlist)) {
 		b43_leds_unregister(wl);
 		/* Last core on the chip unregistered.
 		 * We can destroy common struct b43_wl.
 		 */
-		b43_wireless_exit(wldev->dev, wl);
+		b43_wireless_exit(dev, wl);
 	}
 }