aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.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/548-ath9k_enable_gpio_chip.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/548-ath9k_enable_gpio_chip.patch')
-rw-r--r--package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch11
1 files changed, 5 insertions, 6 deletions
diff --git a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
index 405ca11cb9..32e46ee945 100644
--- a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
+++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
@@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#ifdef CPTCFG_ATH9K_DEBUGFS
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -16,13 +16,135 @@
+@@ -16,13 +16,134 @@
#include "ath9k.h"
#include <linux/ath9k_platform.h>
@@ -138,7 +138,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ gc->gchip.get_direction = ath9k_gpio_pin_get_dir;
+ gc->gchip.get = ath9k_gpio_pin_get;
+ gc->gchip.set = ath9k_gpio_pin_set;
-+ gc->gchip.owner = THIS_MODULE;
+
+ if (gpiochip_add(&gc->gchip)) {
+ kfree(gc);
@@ -183,7 +182,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static void ath_fill_led_pin(struct ath_softc *sc)
{
struct ath_hw *ah = sc->sc_ah;
-@@ -80,6 +202,12 @@ static int ath_add_led(struct ath_softc
+@@ -80,6 +201,12 @@ static int ath_add_led(struct ath_softc
else
ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
@@ -196,7 +195,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return 0;
}
-@@ -136,12 +264,18 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -136,12 +263,18 @@ void ath_deinit_leds(struct ath_softc *s
while (!list_empty(&sc->leds)) {
led = list_first_entry(&sc->leds, struct ath_led, list);
@@ -215,7 +214,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
void ath_init_leds(struct ath_softc *sc)
-@@ -158,6 +292,8 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -158,6 +291,8 @@ void ath_init_leds(struct ath_softc *sc)
ath_fill_led_pin(sc);
@@ -224,7 +223,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (pdata && pdata->led_name)
strncpy(led_name, pdata->led_name, sizeof(led_name));
else
-@@ -178,6 +314,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -178,6 +313,7 @@ void ath_init_leds(struct ath_softc *sc)
for (i = 0; i < pdata->num_leds; i++)
ath_create_platform_led(sc, &pdata->leds[i]);
}