Skip to content

Commit

Permalink
ath9k: Handle ASPM properly for RFKILL
Browse files Browse the repository at this point in the history
Radio enable/disable have to handle ASPM state properly.
This patch fixes it.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Sujith authored and John W. Linville committed Apr 22, 2009
1 parent a89bff9 commit d2f5b3a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/net/wireless/ath/ath9k/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1089,10 +1089,10 @@ void ath_radio_enable(struct ath_softc *sc)
int r;

ath9k_ps_wakeup(sc);
spin_lock_bh(&sc->sc_resetlock);
ath9k_hw_configpcipowersave(ah, 0);

spin_lock_bh(&sc->sc_resetlock);
r = ath9k_hw_reset(ah, ah->curchan, false);

if (r) {
DPRINTF(sc, ATH_DBG_FATAL,
"Unable to reset channel %u (%uMhz) ",
Expand Down Expand Up @@ -1154,6 +1154,7 @@ void ath_radio_disable(struct ath_softc *sc)
spin_unlock_bh(&sc->sc_resetlock);

ath9k_hw_phy_disable(ah);
ath9k_hw_configpcipowersave(ah, 1);
ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP);
ath9k_ps_restore(sc);
}
Expand Down

0 comments on commit d2f5b3a

Please sign in to comment.