b43: work around a locking issue, might fix #5996

[openwrt.git] / package / mac80211 / patches / 401-ath9k-dont-register-leds-on-ar9100.patch

diff --git a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
index 9dd56f2..b458dde 100644 (file)
--- a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
+++ b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
@@ -1,22 +1,22 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1034,6 +1034,9 @@ static void ath_unregister_led(struct at
+@@ -1135,6 +1135,9 @@ static void ath_unregister_led(struct at
  
  static void ath_deinit_leds(struct ath_softc *sc)
  {
 +      if (AR_SREV_9100(sc->sc_ah))
 +              return;
 +
-       cancel_delayed_work_sync(&sc->ath_led_blink_work);
        ath_unregister_led(&sc->assoc_led);
        sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;
-@@ -1048,6 +1051,9 @@ static void ath_init_leds(struct ath_sof
-       char *trigger;
-       int ret;
+       ath_unregister_led(&sc->tx_led);
+@@ -1153,6 +1156,9 @@ static void ath_init_leds(struct ath_sof
+       else
+               sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
  
 +      if (AR_SREV_9100(sc->sc_ah))
 +              return;
 +
        /* Configure gpio 1 for output */
-       ath9k_hw_cfg_output(sc->sc_ah, ATH_LED_PIN,
+       ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin,
                            AR_GPIO_OUTPUT_MUX_AS_OUTPUT);