1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/net/wireless/ath/ar9170/led.c b/drivers/net/wireless/ath/ar9170/led.c
index 3c8a5728920d..63fda6cd2101 100644
--- a/drivers/net/wireless/ath/ar9170/led.c
+++ b/drivers/net/wireless/ath/ar9170/led.c
@@ -74,7 +74,7 @@ static void ar9170_update_leds(struct work_struct *work)
 
         mutex_lock(&ar->mutex);
         for (i = 0; i < AR9170_NUM_LEDS; i++)
-                if (ar->leds[i].toggled) {
+                if (ar->leds[i].registered && ar->leds[i].toggled) {
                         led_val |= 1 << i;
 
                         tmp = 70 + 200 / (ar->leds[i].toggled);
@@ -101,6 +101,9 @@ static void ar9170_led_brightness_set(struct led_classdev *led,
         struct ar9170_led *arl = container_of(led, struct ar9170_led, l);
         struct ar9170 *ar = arl->ar;
 
+        if (unlikely(!arl->registered))
+                return ;
+
         if (arl->last_state != !!brightness) {
                 arl->toggled++;
                 arl->last_state = !!brightness;
@@ -139,13 +142,14 @@ void ar9170_unregister_leds(struct ar9170 *ar)
 {
         int i;
 
-        cancel_delayed_work_sync(&ar->led_work);
-
         for (i = 0; i < AR9170_NUM_LEDS; i++)
                 if (ar->leds[i].registered) {
                         led_classdev_unregister(&ar->leds[i].l);
                         ar->leds[i].registered = false;
+                        ar->leds[i].toggled = 0;
                 }
+
+        cancel_delayed_work_sync(&ar->led_work);
 }
 
 int ar9170_register_leds(struct ar9170 *ar)