ath9k: unset the default LED pin if used by platform leds

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 531-ath9k_extra_platform_leds.patch

diff --git a/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch b/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
index 35d8e8bd42399797d4904f60d61f7118c156ba7c..8ed7ad8a09a13f85e2b0f437020b650cacb89190 100644 (file)
--- a/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
+++ b/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
@@ -56,16 +56,21 @@
  
        INIT_LIST_HEAD(&sc->leds);
  
-@@ -144,6 +165,12 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -134,6 +155,17 @@ void ath_init_leds(struct ath_softc *sc)
  
-       ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
-                          !sc->sc_ah->config.led_active_high);
+       ath_fill_led_pin(sc);
+ 
++      if (pdata && pdata->leds && pdata->num_leds)
++              for (i = 0; i < pdata->num_leds; i++) {
++                      if (pdata->leds[i].gpio == sc->sc_ah->led_pin)
++                              sc->sc_ah->led_pin = -1;
++
++                      ath_create_platform_led(sc, &pdata->leds[i]);
++              }
 +
-+      if (!pdata)
++      if (sc->sc_ah->led_pin < 0)
 +              return;
 +
-+      for (i = 0; i < pdata->num_leds; i++)
-+              ath_create_platform_led(sc, &pdata->leds[i]);
- }
- #endif
+       snprintf(led_name, sizeof(led_name), "ath9k-%s",
+                wiphy_name(sc->hw->wiphy));