aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.3/301-led_count.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-03-28 20:42:09 +0000
committerJonas Gorski <jogo@openwrt.org>2012-03-28 20:42:09 +0000
commitf6e63fd14181a502cde4145d41a182997cbbb163 (patch)
treee59a26a240aaec8d9d12c89cf89a867dc05fcad3 /target/linux/brcm63xx/patches-3.3/301-led_count.patch
parent145aa980fe699f4ecf18bd3e84f4ea581e14cb9e (diff)
downloadupstream-f6e63fd14181a502cde4145d41a182997cbbb163.tar.gz
upstream-f6e63fd14181a502cde4145d41a182997cbbb163.tar.bz2
upstream-f6e63fd14181a502cde4145d41a182997cbbb163.zip
bcm63xx: reorder patches
Reorder patches for a clearer distinction between the purposes of the different patches. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31127 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/301-led_count.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.3/301-led_count.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/301-led_count.patch b/target/linux/brcm63xx/patches-3.3/301-led_count.patch
new file mode 100644
index 0000000000..6dfa42d994
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.3/301-led_count.patch
@@ -0,0 +1,23 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -889,6 +889,7 @@ int __init board_register_devices(void)
+ {
+ u32 val;
+ int button_count = 0;
++ int led_count = 0;
+
+ if (board.has_uart0)
+ bcm63xx_uart_register(0);
+@@ -932,7 +933,11 @@ int __init board_register_devices(void)
+
+ platform_device_register(&mtd_dev);
+
+- bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
++ /* count number of LEDs defined by this device */
++ while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
++ led_count++;
++
++ bcm63xx_led_data.num_leds = led_count;
+ bcm63xx_led_data.leds = board.leds;
+
+ platform_device_register(&bcm63xx_gpio_leds);