ath9k_htc: Cancel BTCOEX related work before disabling BTCOEX
authorMohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Tue, 4 Sep 2012 14:03:39 +0000 (19:33 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Sep 2012 19:13:53 +0000 (15:13 -0400)
Before disabling BTCOEX in the h/w cancel all BTCOEX related
works. This is similar to the commit in ath9k(c32cdbd8)
ath9k: Stop the BTCOEX timers before disabling BTCOEX

Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/htc_drv_gpio.c

index fe4836becaa21f55efdb7f787da6569a5227dad8..8fd64a6f0eb9cad1a1141bfec5976897a682d1cc 100644 (file)
@@ -173,9 +173,9 @@ void ath9k_htc_stop_btcoex(struct ath9k_htc_priv *priv)
 
        if (ah->btcoex_hw.enabled &&
            ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) {
-               ath9k_hw_btcoex_disable(ah);
                if (ah->btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE)
                        ath_htc_cancel_btcoex_work(priv);
+               ath9k_hw_btcoex_disable(ah);
        }
 }