diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-08-13 09:55:10 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-08-13 09:55:10 +0000 |
| commit | 8bccd58c7da7678c1f67525708f11e69006cfe58 (patch) | |
| tree | 5ce786727ea2c3ce90ff88ba45e2d2eb8c4099a2 | |
| parent | 49461068df0f974e2d368f56c971eae910b3e1bd (diff) | |
| download | upstream-8bccd58c7da7678c1f67525708f11e69006cfe58.tar.gz upstream-8bccd58c7da7678c1f67525708f11e69006cfe58.tar.bz2 upstream-8bccd58c7da7678c1f67525708f11e69006cfe58.zip | |
[brcm63xx] leds: do not register device if no leds defined
Signed-off-by: Miguel GAIO <miguel.gaio@efixo.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33158 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/brcm63xx/patches-3.3/301-led_count.patch | 15 |
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 { |