The following commit has been merged in the linux branch: commit f5b4da21ba293220001b5fd36be75c859b18afc1 Author: Larry Finger Larry.Finger@lwfinger.net Date: Fri Oct 2 12:54:34 2009 -0500

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

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 86f3582..df6b26a 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);