1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 4c0831ff6e92..56d4a93cd8e5 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -857,9 +857,14 @@ void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw)
         ath9k_ps_wakeup(sc);
         ieee80211_stop_queues(hw);
 
-        /* Disable LED */
-        ath9k_hw_set_gpio(ah, ah->led_pin, 1);
-        ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
+        /*
+         * Keep the LED on when the radio is disabled
+         * during idle unassociated state.
+         */
+        if (!sc->ps_idle) {
+                ath9k_hw_set_gpio(ah, ah->led_pin, 1);
+                ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
+        }
 
         /* Disable interrupts */
         ath9k_hw_set_interrupts(ah, 0);