diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-08-05 09:09:41 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-08-05 09:09:41 +0000 |
| commit | 885cf1f19f1591cbd8220e8ac6469a0fee40dcbe (patch) | |
| tree | ebfcc78afcfde5b6de1c4f240db62ef9fb36fad4 | |
| parent | 3573494b190dd16cb77eb01b78f4a9506a85c5b1 (diff) | |
| download | upstream-885cf1f19f1591cbd8220e8ac6469a0fee40dcbe.tar.gz upstream-885cf1f19f1591cbd8220e8ac6469a0fee40dcbe.tar.bz2 upstream-885cf1f19f1591cbd8220e8ac6469a0fee40dcbe.zip | |
mac80211: rt2x00: fix LED polarity patch
The patch causes compiler warning ...
<...>/drivers/net/wireless/rt2x00/rt2800lib.c: In function 'rt2800_init_eeprom':
<...>/drivers/net/wireless/rt2x00/rt2800lib.c:5971:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
... and runtime errors on PCI/USB devices:
[ 11.810000] ieee80211 phy0: rt2x00_set_rt: Info - RT chipset 3071, rev 021c detected
[ 11.830000] ieee80211 phy0: rt2x00_set_rf: Info - RF chipset 0001 detected
[ 11.880000] rt2x00mmio_regbusy_read() Indirect register access failed: offset=0x00007010, value=0x01ff0001
[ 12.080000] usb 1-1: reset high-speed USB device number 2 using ehci-platform
[ 12.250000] ieee80211 phy1: rt2x00_set_rt: Info - RT chipset 5592, rev 0222 detecte
[ 12.300000] ieee80211 phy1: rt2x00_set_rf: Info - RF chipset 000f detected
[ 12.350000] ieee80211 phy1: rt2x00usb_regbusy_read: Error - Indirect register access failed: offset=0x00007010, value=0x1a93b47
[ 12.430000] ieee80211 phy1: rt2x00usb_regbusy_read: Error - Indirect register access failed: offset=0x00007010, value=0x11a93b47
[ 12.480000] ieee80211 phy1: rt2x00usb_regbusy_read: Error - Indirect register access failed: offset=0x00007010, value=0x11a93b47
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37698
| -rw-r--r-- | package/kernel/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/package/kernel/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch b/package/kernel/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch index bf0572e691..03f4ddd11b 100644 --- a/package/kernel/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch +++ b/package/kernel/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch @@ -8,27 +8,33 @@ #include "rt2x00.h" #include "rt2800lib.h" -@@ -5966,6 +5967,13 @@ static int rt2800_init_eeprom(struct rt2 +@@ -5966,6 +5967,17 @@ static int rt2800_init_eeprom(struct rt2 rt2800_init_led(rt2x00dev, &rt2x00dev->led_assoc, LED_TYPE_ASSOC); rt2800_init_led(rt2x00dev, &rt2x00dev->led_qual, LED_TYPE_QUALITY); -+ /* Allow overriding polarity from OF */ -+ struct device_node *np = rt2x00dev->dev->of_node; -+ unsigned int led_polarity; ++ { ++ struct device_node *np = rt2x00dev->dev->of_node; ++ unsigned int led_polarity; + -+ if (!of_property_read_u32(np, "ralink,led-polarity", &led_polarity)) -+ rt2x00_set_field16(&eeprom, EEPROM_FREQ_LED_POLARITY, led_polarity); ++ /* Allow overriding polarity from OF */ ++ if (!of_property_read_u32(np, "ralink,led-polarity", ++ &led_polarity)) ++ rt2x00_set_field16(&eeprom, EEPROM_FREQ_LED_POLARITY, ++ led_polarity); ++ } + rt2x00dev->led_mcu_reg = eeprom; #endif /* CPTCFG_RT2X00_LIB_LEDS */ --- a/drivers/net/wireless/rt2x00/rt2x00leds.c +++ b/drivers/net/wireless/rt2x00/rt2x00leds.c -@@ -110,6 +110,7 @@ static int rt2x00leds_register_led(struc - +@@ -111,6 +111,9 @@ static int rt2x00leds_register_led(struc led->led_dev.name = name; led->led_dev.brightness = LED_OFF; -+ led->led_dev.brightness_set(&led->led_dev, LED_OFF); ++ if (rt2x00_is_soc(rt2x00dev)) ++ led->led_dev.brightness_set(&led->led_dev, LED_OFF); ++ retval = led_classdev_register(device, &led->led_dev); if (retval) { + rt2x00_err(rt2x00dev, "Failed to register led handler\n"); |