aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-08-13 09:55:10 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-08-13 09:55:10 +0000
commitf164b71189783fa57f6790b47520bf361a3be05f (patch)
tree6b387e150866109dd45ddfac97d43ddc1697fc90 /target/linux
parentf0f10014a0af6bb3c68a877d168aa2bf2fab4a50 (diff)
downloadupstream-f164b71189783fa57f6790b47520bf361a3be05f.tar.gz
upstream-f164b71189783fa57f6790b47520bf361a3be05f.tar.bz2
upstream-f164b71189783fa57f6790b47520bf361a3be05f.zip
leds: do not register device if no leds defined
Signed-off-by: Miguel GAIO <miguel.gaio@efixo.com> SVN-Revision: 33158
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm63xx/patches-3.3/301-led_count.patch15
1 files changed, 11 insertions, 4 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
index 84d57a00dd..b6c1196a52 100644
--- a/target/linux/brcm63xx/patches-3.3/301-led_count.patch
+++ b/target/linux/brcm63xx/patches-3.3/301-led_count.patch
@@ -8,19 +8,26 @@
if (board.has_uart0)
bcm63xx_uart_register(0);
-@@ -900,7 +901,11 @@ int __init board_register_devices(void)
+@@ -900,10 +901,16 @@ int __init board_register_devices(void)
bcm63xx_flash_register();
- bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
+- bcm63xx_led_data.leds = 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;
++ if (led_count) {
++ bcm63xx_led_data.num_leds = led_count;
++ bcm63xx_led_data.leds = board.leds;
- platform_device_register(&bcm63xx_gpio_leds);
+- platform_device_register(&bcm63xx_gpio_leds);
++ platform_device_register(&bcm63xx_gpio_leds);
++ }
+
+ /* count number of BUTTONs defined by this device */
+ while (button_count < ARRAY_SIZE(board.buttons) && board.buttons[button_count].desc)
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
@@ -57,7 +57,7 @@ struct board_info {