Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 172235
b: refs/heads/master
c: 316a4d9
h: refs/heads/master
i:
  172233: f171798
  172231: ea37f36
v: v3
  • Loading branch information
Larry Finger authored and John W. Linville committed Dec 4, 2009
1 parent a83d634 commit 66a91ff
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c2ff581acab16c6af56d9e8c1a579bf041ec00b1
refs/heads/master: 316a4d966cae3c2dec83ebb1ee1a3515f97b30ff
7 changes: 7 additions & 0 deletions trunk/drivers/net/wireless/b43legacy/rfkill.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev)
& B43legacy_MMIO_RADIO_HWENABLED_HI_MASK))
return 1;
} else {
/* To prevent CPU fault on PPC, do not read a register
* unless the interface is started; however, on resume
* for hibernation, this routine is entered early. When
* that happens, unconditionally return TRUE.
*/
if (b43legacy_status(dev) < B43legacy_STAT_STARTED)
return 1;
if (b43legacy_read16(dev, B43legacy_MMIO_RADIO_HWENABLED_LO)
& B43legacy_MMIO_RADIO_HWENABLED_LO_MASK)
return 1;
Expand Down

0 comments on commit 66a91ff

Please sign in to comment.