To: Larry Finger , John W. Linville cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org From d800aef9db80ba1168f336791f4c5e8d4d0517c3 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Thu, 19 Nov 2009 14:52:22 -0600 Subject: [PATCH] b43legacy: Port b43 rfkill fix to b43legacy BugLink: https://bugs.launchpad.net/bugs/476154 "b43: Fix Bugzilla #14181 and the bug from the previous 'fix'" fixed a crash with the b43 driver, that happens if the radio switch is turned off. The same happens when using the b43legacy driver and it was verified, that the same changes just work in that case too. CC: stable@kernel.org Signed-off-by: Stefan Bader --- drivers/net/wireless/b43legacy/rfkill.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c index 8783022..ad7083e 100644 --- a/drivers/net/wireless/b43legacy/rfkill.c +++ b/drivers/net/wireless/b43legacy/rfkill.c @@ -34,7 +34,8 @@ bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev) & B43legacy_MMIO_RADIO_HWENABLED_HI_MASK)) return 1; } else { - if (b43legacy_read16(dev, B43legacy_MMIO_RADIO_HWENABLED_LO) + if (b43legacy_status(dev) >= B43legacy_STAT_STARTED && + b43legacy_read16(dev, B43legacy_MMIO_RADIO_HWENABLED_LO) & B43legacy_MMIO_RADIO_HWENABLED_LO_MASK) return 1; } -- 1.6.3.3