summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2009-10-02 12:54:34 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-10-07 16:33:51 -0400
commitf5b4da21ba293220001b5fd36be75c859b18afc1 (patch)
tree4a30a92a8052f3da53020d48bc213916e5defce8 /drivers
parent0819663d164e090de315c5e619f4e23c27aaff88 (diff)
downloadlinux-3.10-f5b4da21ba293220001b5fd36be75c859b18afc1.tar.gz
linux-3.10-f5b4da21ba293220001b5fd36be75c859b18afc1.tar.bz2
linux-3.10-f5b4da21ba293220001b5fd36be75c859b18afc1.zip
b43: Fix PPC crash in rfkill polling on unload
In Bugzilla No. 14181, a PowerMac G4 crashes on ifdown or module unload because the rfkill polling has not been stopped. For the x86 architectures, the attempt to reach a now unmapped register is not fatal as it is on PPC. (Includes "b43: Fix locking problem when stopping rfkill polling". -- JWL) Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/b43/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 86f35827f00..df6b26a0c05 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/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);