X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/23674ee04812bbfd15be68641798d33b508bde63..a040c13eb6c63e1799ce17ad8d3dd2267d9ae4b3:/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch?ds=inline

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 71b0ae469..d60be760d 100644
--- 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,12 @@
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1054,6 +1054,9 @@ static void ath_unregister_led(struct at
- 
- static void ath_deinit_leds(struct ath_softc *sc)
+--- a/drivers/net/wireless/ath/ath9k/gpio.c
++++ b/drivers/net/wireless/ath/ath9k/gpio.c
+@@ -41,6 +41,9 @@ void ath_init_leds(struct ath_softc *sc)
  {
-+	if (AR_SREV_9100(sc->sc_ah))
-+		return;
-+
- 	ath_unregister_led(&sc->assoc_led);
- 	sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;
- 	ath_unregister_led(&sc->tx_led);
-@@ -1072,6 +1075,9 @@ static void ath_init_leds(struct ath_sof
- 	else
- 		sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
+ 	int ret;
  
 +	if (AR_SREV_9100(sc->sc_ah))
 +		return;
 +
- 	/* Configure gpio 1 for output */
- 	ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin,
- 			    AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+ 	if (sc->sc_ah->led_pin < 0) {
+ 		if (AR_SREV_9287(sc->sc_ah))
+ 			sc->sc_ah->led_pin = ATH_LED_PIN_9287;