target/linux/brcm63xx/patches-3.3/301-led_count.patch

   1 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
   2 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
   3 @@ -862,6 +862,7 @@ static struct platform_device bcm63xx_gp
   4  int __init board_register_devices(void)
   5  {
   6         int button_count = 0;
   7 +       int led_count = 0;
   8
   9         if (board.has_uart0)
  10                 bcm63xx_uart_register(0);
  11 @@ -900,7 +901,11 @@ int __init board_register_devices(void)
  12
  13         bcm63xx_flash_register();
  14
  15 -       bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
  16 +       /* count number of LEDs defined by this device */
  17 +       while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
  18 +               led_count++;
  19 +
  20 +       bcm63xx_led_data.num_leds = led_count;
  21         bcm63xx_led_data.leds = board.leds;
  22
  23         platform_device_register(&bcm63xx_gpio_leds);
  24 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
  25 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
  26 @@ -57,7 +57,7 @@ struct board_info {
  27         struct bcm63xx_dsp_platform_data dsp;
  28
  29         /* GPIO LEDs */
  30 -       struct gpio_led leds[5];
  31 +       struct gpio_led leds[14];
  32
  33         /* Buttons */
  34         struct gpio_keys_button buttons[4];