From 70cc715fa8b8b81a22b36d01a39444cac49632bf Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Fri, 2 Oct 2009 12:54:34 -0500
Subject: [PATCH] --- yaml --- r: 167516 b: refs/heads/master c:
 f5b4da21ba293220001b5fd36be75c859b18afc1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d627c7a5fd47..d70432a03c92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0819663d164e090de315c5e619f4e23c27aaff88
+refs/heads/master: f5b4da21ba293220001b5fd36be75c859b18afc1
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index 86f35827f008..df6b26a0c05e 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/drivers/net/wireless/b43/main.c
@@ -4501,6 +4501,7 @@ static void b43_op_stop(struct ieee80211_hw *hw)
 
 	cancel_work_sync(&(wl->beacon_update_trigger));
 
+	wiphy_rfkill_stop_polling(hw->wiphy);
 	mutex_lock(&wl->mutex);
 	if (b43_status(dev) >= B43_STAT_STARTED) {
 		dev = b43_wireless_core_stop(dev);