1 files changed, 34 insertions, 24 deletions

diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 45f24220b16e..bf7d29ec1a87 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -44,25 +44,6 @@ void ath_init_leds(struct ath_softc *sc)
         if (AR_SREV_9100(sc->sc_ah))
                 return;
 
-        if (sc->sc_ah->led_pin < 0) {
-                if (AR_SREV_9287(sc->sc_ah))
-                        sc->sc_ah->led_pin = ATH_LED_PIN_9287;
-                else if (AR_SREV_9485(sc->sc_ah))
-                        sc->sc_ah->led_pin = ATH_LED_PIN_9485;
-                else if (AR_SREV_9300(sc->sc_ah))
-                        sc->sc_ah->led_pin = ATH_LED_PIN_9300;
-                else if (AR_SREV_9462(sc->sc_ah) || AR_SREV_9565(sc->sc_ah))
-                        sc->sc_ah->led_pin = ATH_LED_PIN_9462;
-                else
-                        sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
-        }
-
-        /* Configure gpio 1 for output */
-        ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin,
-                            AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-        /* LED off, active low */
-        ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1);
-
         if (!led_blink)
                 sc->led_cdev.default_trigger =
                         ieee80211_get_radio_led_name(sc->hw);
@@ -78,6 +59,31 @@ void ath_init_leds(struct ath_softc *sc)
 
         sc->led_registered = true;
 }
+
+void ath_fill_led_pin(struct ath_softc *sc)
+{
+        struct ath_hw *ah = sc->sc_ah;
+
+        if (AR_SREV_9100(ah) || (ah->led_pin >= 0))
+                return;
+
+        if (AR_SREV_9287(ah))
+                ah->led_pin = ATH_LED_PIN_9287;
+        else if (AR_SREV_9485(sc->sc_ah))
+                ah->led_pin = ATH_LED_PIN_9485;
+        else if (AR_SREV_9300(sc->sc_ah))
+                ah->led_pin = ATH_LED_PIN_9300;
+        else if (AR_SREV_9462(sc->sc_ah) || AR_SREV_9565(sc->sc_ah))
+                ah->led_pin = ATH_LED_PIN_9462;
+        else
+                ah->led_pin = ATH_LED_PIN_DEF;
+
+        /* Configure gpio 1 for output */
+        ath9k_hw_cfg_output(ah, ah->led_pin, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+
+        /* LED off, active low */
+        ath9k_hw_set_gpio(ah, ah->led_pin, 1);
+}
 #endif
 
 /*******************/
@@ -314,8 +320,10 @@ void ath9k_btcoex_timer_resume(struct ath_softc *sc)
         ath_dbg(ath9k_hw_common(ah), BTCOEX, "Starting btcoex timers\n");
 
         /* make sure duty cycle timer is also stopped when resuming */
-        if (btcoex->hw_timer_enabled)
+        if (btcoex->hw_timer_enabled) {
                 ath9k_gen_timer_stop(sc->sc_ah, btcoex->no_stomp_timer);
+                btcoex->hw_timer_enabled = false;
+        }
 
         btcoex->bt_priority_cnt = 0;
         btcoex->bt_priority_time = jiffies;
@@ -336,18 +344,20 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc)
 
         del_timer_sync(&btcoex->period_timer);
 
-        if (btcoex->hw_timer_enabled)
+        if (btcoex->hw_timer_enabled) {
                 ath9k_gen_timer_stop(ah, btcoex->no_stomp_timer);
-
-        btcoex->hw_timer_enabled = false;
+                btcoex->hw_timer_enabled = false;
+        }
 }
 
 void ath9k_btcoex_stop_gen_timer(struct ath_softc *sc)
 {
         struct ath_btcoex *btcoex = &sc->btcoex;
 
-        if (btcoex->hw_timer_enabled)
+        if (btcoex->hw_timer_enabled) {
                 ath9k_gen_timer_stop(sc->sc_ah, btcoex->no_stomp_timer);
+                btcoex->hw_timer_enabled = false;
+        }
 }
 
 u16 ath9k_btcoex_aggr_limit(struct ath_softc *sc, u32 max_4ms_framelen)