diff options
| author | Vivek Natarajan <vnatarajan@atheros.com> | 2010-11-10 04:41:07 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-16 15:59:38 -0500 |
| commit | e8364bb8d041c0fd92d69a17ff19f535e1d1c187 (patch) | |
| tree | 258c569dd44ce76e8dd9cde16224269035819e16 /drivers | |
| parent | dfa31fef5dd3d204c4cdae7369f3542bd1f7e84a (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 3 |
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 6a0d99eff404..92bc5c5f4876 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) | |||
| 817 | 817 | ||
| 818 | ath9k_ps_wakeup(sc); | 818 | ath9k_ps_wakeup(sc); |
| 819 | 819 | ||
| 820 | pm_qos_remove_request(&ath9k_pm_qos_req); | ||
| 821 | |||
| 822 | wiphy_rfkill_stop_polling(sc->hw->wiphy); | 820 | wiphy_rfkill_stop_polling(sc->hw->wiphy); |
| 823 | ath_deinit_leds(sc); | 821 | ath_deinit_leds(sc); |
| 824 | 822 | ||
| @@ -832,6 +830,7 @@ void ath9k_deinit_device(struct ath_softc *sc) | |||
| 832 | } | 830 | } |
| 833 | 831 | ||
| 834 | ieee80211_unregister_hw(hw); | 832 | ieee80211_unregister_hw(hw); |
| 833 | pm_qos_remove_request(&ath9k_pm_qos_req); | ||
| 835 | ath_rx_cleanup(sc); | 834 | ath_rx_cleanup(sc); |
| 836 | ath_tx_cleanup(sc); | 835 | ath_tx_cleanup(sc); |
| 837 | ath9k_deinit_softc(sc); | 836 | ath9k_deinit_softc(sc); |
