diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-30 00:28:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-30 00:28:59 -0400 |
| commit | 0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01 (patch) | |
| tree | 2e336be8a4bd2e59bcd4b69b00feb77c6672a9cb /drivers/net/wireless/b43/rfkill.c | |
| parent | 38bfd8f5bec496e8e0db8849e01c99a33479418a (diff) | |
| parent | b5dd884e682cae6b8c037f9d11f3b623b4cf2011 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/wireless/b43/rfkill.c')
| -rw-r--r-- | drivers/net/wireless/b43/rfkill.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c index 7a3218c5ba7d..ffdce6f3c909 100644 --- a/drivers/net/wireless/b43/rfkill.c +++ b/drivers/net/wireless/b43/rfkill.c | |||
| @@ -33,7 +33,8 @@ bool b43_is_hw_radio_enabled(struct b43_wldev *dev) | |||
| 33 | & B43_MMIO_RADIO_HWENABLED_HI_MASK)) | 33 | & B43_MMIO_RADIO_HWENABLED_HI_MASK)) |
| 34 | return 1; | 34 | return 1; |
| 35 | } else { | 35 | } else { |
| 36 | if (b43_read16(dev, B43_MMIO_RADIO_HWENABLED_LO) | 36 | if (b43_status(dev) >= B43_STAT_STARTED && |
| 37 | b43_read16(dev, B43_MMIO_RADIO_HWENABLED_LO) | ||
| 37 | & B43_MMIO_RADIO_HWENABLED_LO_MASK) | 38 | & B43_MMIO_RADIO_HWENABLED_LO_MASK) |
| 38 | return 1; | 39 | return 1; |
| 39 | } | 40 | } |