diff options
author | David S. Miller <davem@davemloft.net> | 2010-11-19 16:13:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-19 16:13:47 -0500 |
commit | 24912420e923d56461b400d83f250a31bed8a964 (patch) | |
tree | 3bb599e665ed7510df2e3f4c8cb008f7a33f50a9 /drivers/net/wireless/ath/ath9k/init.c | |
parent | 0670b8ae66daf1d326c7bd10e73daff5f18fcf92 (diff) | |
parent | 0302b8622ce696af1cda22fcf207d3793350e896 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
net/core/net-sysfs.c
net/ipv6/addrconf.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
-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 d28e580bb48..5c26818d79e 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
@@ -811,8 +811,6 @@ void ath9k_deinit_device(struct ath_softc *sc) | |||
811 | 811 | ||
812 | ath9k_ps_wakeup(sc); | 812 | ath9k_ps_wakeup(sc); |
813 | 813 | ||
814 | pm_qos_remove_request(&ath9k_pm_qos_req); | ||
815 | |||
816 | wiphy_rfkill_stop_polling(sc->hw->wiphy); | 814 | wiphy_rfkill_stop_polling(sc->hw->wiphy); |
817 | ath_deinit_leds(sc); | 815 | ath_deinit_leds(sc); |
818 | 816 | ||
@@ -826,6 +824,7 @@ void ath9k_deinit_device(struct ath_softc *sc) | |||
826 | } | 824 | } |
827 | 825 | ||
828 | ieee80211_unregister_hw(hw); | 826 | ieee80211_unregister_hw(hw); |
827 | pm_qos_remove_request(&ath9k_pm_qos_req); | ||
829 | ath_rx_cleanup(sc); | 828 | ath_rx_cleanup(sc); |
830 | ath_tx_cleanup(sc); | 829 | ath_tx_cleanup(sc); |
831 | ath9k_deinit_softc(sc); | 830 | ath9k_deinit_softc(sc); |