aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivek Natarajan <vnatarajan@atheros.com>2010-11-10 15:11:07 +0530
committerJohn W. Linville <linville@tuxdriver.com>2010-11-16 15:59:38 -0500
commite8364bb8d041c0fd92d69a17ff19f535e1d1c187 (patch)
tree258c569dd44ce76e8dd9cde16224269035819e16
parentdfa31fef5dd3d204c4cdae7369f3542bd1f7e84a (diff)
downloadmrst-s0i3-test-e8364bb8d041c0fd92d69a17ff19f535e1d1c187.tar.gz
mrst-s0i3-test-e8364bb8d041c0fd92d69a17ff19f535e1d1c187.tar.xz
mrst-s0i3-test-e8364bb8d041c0fd92d69a17ff19f535e1d1c187.zip
ath9k: Remove pm_qos request after hw unregister.
Update pm_qos before removing it in deinit_device to prevent this warning: pm_qos_update_request() called for unknown object. Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/init.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 6a0d99eff40..92bc5c5f487 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -817,8 +817,6 @@ void ath9k_deinit_device(struct ath_softc *sc)
ath9k_ps_wakeup(sc);
- pm_qos_remove_request(&ath9k_pm_qos_req);
-
wiphy_rfkill_stop_polling(sc->hw->wiphy);
ath_deinit_leds(sc);
@@ -832,6 +830,7 @@ void ath9k_deinit_device(struct ath_softc *sc)
}
ieee80211_unregister_hw(hw);
+ pm_qos_remove_request(&ath9k_pm_qos_req);
ath_rx_cleanup(sc);
ath_tx_cleanup(sc);
ath9k_deinit_softc(sc);