projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: explicitly clear gpio chip owner
[openwrt/staging/chunkeey.git]
/
package
/
kernel
/
mac80211
/
patches
/
548-ath9k_enable_gpio_chip.patch
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 32e46ee945060cefd090abec61290c29f1f2a888..af5e9f6358f6cbf86cd346f1733ab265e0c39df0 100644
(file)
--- 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
#ifdef CPTCFG_ATH9K_DEBUGFS
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -16,13 +16,13
4
@@
+@@ -16,13 +16,13
5
@@
#include "ath9k.h"
#include <linux/ath9k_platform.h>
#include "ath9k.h"
#include <linux/ath9k_platform.h>
@@
-144,6
+144,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ return;
+ }
+
+ return;
+ }
+
++ gc->gchip.owner = NULL;
+ sc->gpiochip = gc;
+ gc->sc = sc;
+}
+ sc->gpiochip = gc;
+ gc->sc = sc;
+}
@@
-182,7
+183,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;
static void ath_fill_led_pin(struct ath_softc *sc)
{
struct ath_hw *ah = sc->sc_ah;
-@@ -80,6 +20
1
,12 @@ static int ath_add_led(struct ath_softc
+@@ -80,6 +20
2
,12 @@ static int ath_add_led(struct ath_softc
else
ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
else
ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
@@
-195,7
+196,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
return 0;
}
return 0;
}
-@@ -136,12 +26
3
,18 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -136,12 +26
4
,18 @@ void ath_deinit_leds(struct ath_softc *s
while (!list_empty(&sc->leds)) {
led = list_first_entry(&sc->leds, struct ath_led, list);
while (!list_empty(&sc->leds)) {
led = list_first_entry(&sc->leds, struct ath_led, list);
@@
-214,7
+215,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
void ath_init_leds(struct ath_softc *sc)
}
void ath_init_leds(struct ath_softc *sc)
-@@ -158,6 +29
1
,8 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -158,6 +29
2
,8 @@ void ath_init_leds(struct ath_softc *sc)
ath_fill_led_pin(sc);
ath_fill_led_pin(sc);
@@
-223,7
+224,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (pdata && pdata->led_name)
strncpy(led_name, pdata->led_name, sizeof(led_name));
else
if (pdata && pdata->led_name)
strncpy(led_name, pdata->led_name, sizeof(led_name));
else
-@@ -178,6 +31
3
,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -178,6 +31
4
,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]);
}
for (i = 0; i < pdata->num_leds; i++)
ath_create_platform_led(sc, &pdata->leds[i]);
}