From a73b10c95f22a74e8a1c6cb051c4310c4771e13a Mon Sep 17 00:00:00 2001 From: Rajkumar Manoharan Date: Thu, 27 Jan 2011 18:39:38 +0530 Subject: [PATCH] --- yaml --- r: 232867 b: refs/heads/master c: c7c1806098752c1f46943d8db2c69aff07f5d4bc h: refs/heads/master i: 232865: 9320fcbfd71270b100b9475750803f678d93316b 232863: 54f0845b45dcc4ed72597929be5140c18c830953 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/init.c | 2 ++ trunk/drivers/net/wireless/ath/ath9k/main.c | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c576ff680b47..6259941d3da6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b64aa72ead6f8be488d2be7af579f0d69fb7a6e +refs/heads/master: c7c1806098752c1f46943d8db2c69aff07f5d4bc diff --git a/trunk/drivers/net/wireless/ath/ath9k/init.c b/trunk/drivers/net/wireless/ath/ath9k/init.c index b3254a3484a5..087a6a95edd5 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/init.c +++ b/trunk/drivers/net/wireless/ath/ath9k/init.c @@ -819,6 +819,8 @@ void ath9k_deinit_device(struct ath_softc *sc) wiphy_rfkill_stop_polling(sc->hw->wiphy); ath_deinit_leds(sc); + ath9k_ps_restore(sc); + for (i = 0; i < sc->num_sec_wiphy; i++) { struct ath_wiphy *aphy = sc->sec_wiphy[i]; if (aphy == NULL) diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c index ace9f066fa20..568f7be2ec75 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/main.c +++ b/trunk/drivers/net/wireless/ath/ath9k/main.c @@ -953,8 +953,6 @@ void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw) spin_unlock_bh(&sc->sc_pcu_lock); ath9k_ps_restore(sc); - - ath9k_setpower(sc, ATH9K_PM_FULL_SLEEP); } int ath_reset(struct ath_softc *sc, bool retry_tx)