aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-2.6.35/141-led_count.patch
diff options
context:
space:
mode:
authorDaniel Dickinson <crazycshore@gmail.com>2010-12-07 17:32:29 +0000
committerDaniel Dickinson <crazycshore@gmail.com>2010-12-07 17:32:29 +0000
commitf8ed133c0a816ace12bdd11cb3eb3fed168f1186 (patch)
tree14daddd7ddd37b92305e667bc7efb811b5f405d6 /target/linux/brcm63xx/patches-2.6.35/141-led_count.patch
parent0e839ea40d9ee103202cc94f3e24a6cd67501f8d (diff)
downloadupstream-f8ed133c0a816ace12bdd11cb3eb3fed168f1186.tar.gz
upstream-f8ed133c0a816ace12bdd11cb3eb3fed168f1186.tar.bz2
upstream-f8ed133c0a816ace12bdd11cb3eb3fed168f1186.zip
patches: Renamed 150-led_count to 141-led_count so it comes before the 15-alice_gate2_leds.patch as which led count was mistakenly given the same number.
SVN-Revision: 24310
Diffstat (limited to 'target/linux/brcm63xx/patches-2.6.35/141-led_count.patch')
-rw-r--r--target/linux/brcm63xx/patches-2.6.35/141-led_count.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.35/141-led_count.patch b/target/linux/brcm63xx/patches-2.6.35/141-led_count.patch
new file mode 100644
index 0000000000..baf092053d
--- /dev/null
+++ b/target/linux/brcm63xx/patches-2.6.35/141-led_count.patch
@@ -0,0 +1,23 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -881,6 +881,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);
+@@ -922,7 +923,11 @@ int __init board_register_devices(void)
+
+ platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
+
+- 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);