aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-07-11 15:46:19 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-11 15:46:42 +0200
commit5b07e8731b9f02b602f2410ff6dd57fc9ba7b9b6 (patch)
tree01eaf58b53f0a21d09411ce7f425b561402a8174 /package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
parent5ce2341a03263daa1a09bb86e302591bb6516719 (diff)
downloadupstream-5b07e8731b9f02b602f2410ff6dd57fc9ba7b9b6.tar.gz
upstream-5b07e8731b9f02b602f2410ff6dd57fc9ba7b9b6.tar.bz2
upstream-5b07e8731b9f02b602f2410ff6dd57fc9ba7b9b6.zip
ath9k: remove gpio chip owner field to fix module unloading
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch')
-rw-r--r--package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch10
1 files changed, 5 insertions, 5 deletions
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 d962eda978..25496106ae 100644
--- a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
+++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
@@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#ifdef CPTCFG_MAC80211_LEDS
-@@ -129,6 +131,64 @@ static void ath9k_unregister_gpio_chip(s
+@@ -128,6 +130,64 @@ static void ath9k_unregister_gpio_chip(s
sc->gpiochip = NULL;
}
@@ -94,7 +94,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#else /* CONFIG_GPIOLIB */
static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
-@@ -139,6 +199,14 @@ static inline void ath9k_unregister_gpio
+@@ -138,6 +198,14 @@ static inline void ath9k_unregister_gpio
{
}
@@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif /* CONFIG_GPIOLIB */
/********************************/
-@@ -262,6 +330,7 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -261,6 +329,7 @@ void ath_deinit_leds(struct ath_softc *s
{
struct ath_led *led;
@@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
while (!list_empty(&sc->leds)) {
led = list_first_entry(&sc->leds, struct ath_led, list);
#ifdef CONFIG_GPIOLIB
-@@ -293,6 +362,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -292,6 +361,7 @@ void ath_init_leds(struct ath_softc *sc)
ath_fill_led_pin(sc);
ath9k_register_gpio_chip(sc);
@@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
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)
+@@ -307,7 +377,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);