b43: rfkill: use HI enabled bit for all devices
Devices which use LO enabled bit are covered by b43legacy Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
8933f90c77
commit
8ce4699995
|
@ -28,23 +28,8 @@
|
||||||
/* Returns TRUE, if the radio is enabled in hardware. */
|
/* Returns TRUE, if the radio is enabled in hardware. */
|
||||||
bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
|
bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
|
||||||
{
|
{
|
||||||
if (dev->phy.rev >= 3 || dev->phy.type == B43_PHYTYPE_LP) {
|
return !(b43_read32(dev, B43_MMIO_RADIO_HWENABLED_HI)
|
||||||
if (!(b43_read32(dev, B43_MMIO_RADIO_HWENABLED_HI)
|
& B43_MMIO_RADIO_HWENABLED_HI_MASK);
|
||||||
& B43_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 (b43_status(dev) < B43_STAT_STARTED)
|
|
||||||
return 1;
|
|
||||||
if (b43_read16(dev, B43_MMIO_RADIO_HWENABLED_LO)
|
|
||||||
& B43_MMIO_RADIO_HWENABLED_LO_MASK)
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The poll callback for the hardware button. */
|
/* The poll callback for the hardware button. */
|
||||||
|
|
Loading…
Reference in a new issue