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

[openwrt/staging/florian.git] / package / kernel / mac80211 / patches / 549-ath9k_enable_gpio_buttons.patch

diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
index f40bac93c34660f5d9bb515f79287d768b8d6014..8aefcf4d0746e9792ea66a50ae3e4275ae8346f8 100644 (file)
--- a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
+++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
@@ -123,17 +123,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        ath9k_register_gpio_chip(sc);
 +      ath9k_init_buttons(sc);
  
-       if (pdata && pdata->led_name)
-               strncpy(led_name, pdata->led_name, sizeof(led_name));
-@@ -308,7 +378,7 @@ 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);
- 
--      if (!pdata)
-+      if (!pdata || !pdata->leds || !pdata->num_leds)
-               return;
- 
-       for (i = 0; i < pdata->num_leds; i++)
+       if (pdata && pdata->leds && pdata->num_leds)
+               for (i = 0; i < pdata->num_leds; i++) {
 --- a/include/linux/ath9k_platform.h
 +++ b/include/linux/ath9k_platform.h
 @@ -50,6 +50,10 @@ struct ath9k_platform_data {