Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

Pull LED subsystem updates from Bryan Wu:
 "In this cycle, we finished to merge patches for LED Flash class
  driver.

  Other than that we have some bug fixes and new drivers for LED
  controllers"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (33 commits)
  leds:lp55xx: fix firmware loading error
  leds: fix max77693-led build errors
  leds: fix aat1290 build errors
  leds: aat1290: pass flags parameter to devm_gpiod_get
  leds: ktd2692: pass flags parameter to devm_gpiod_get
  drivers/leds: don't use module_init in non-modular leds-cobalt-raq.c
  leds: aat1290: add support for V4L2 Flash sub-device
  DT: aat1290: Document handling external strobe sources
  leds: max77693: add support for V4L2 Flash sub-device
  media: Add registration helpers for V4L2 flash sub-devices
  v4l: async: Add a pointer to of_node to struct v4l2_subdev, match it
  Documentation: leds: Add description of v4l2-flash sub-device
  leds: add BCM6358 LED driver
  leds: add DT binding for BCM6358 LED controller
  leds: fix brightness changing when software blinking is active
  Documentation: leds-lp5523: describe master fader attributes
  leds: lp5523: add master_fader support
  leds: leds-gpio: Allow compile test if !GPIOLIB
  leds: leds-gpio: Add missing #include <linux/of.h>
  gpiolib: Add missing dummies for the unified device properties interface
  ...

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index d2d54d62afee..af1876a3a77c 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/leds.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/slab.h>
@@ -198,8 +199,10 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
                 } else {
                         if (IS_ENABLED(CONFIG_OF) && !led.name && np)
                                 led.name = np->name;
-                        if (!led.name)
-                                return ERR_PTR(-EINVAL);
+                        if (!led.name) {
+                                ret = -EINVAL;
+                                goto err;
+                        }
                 }
                 fwnode_property_read_string(child, "linux,default-trigger",
                                             &led.default_trigger);
@@ -217,18 +220,19 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
                 if (fwnode_property_present(child, "retain-state-suspended"))
                         led.retain_state_suspended = 1;
 
-                ret = create_gpio_led(&led, &priv->leds[priv->num_leds++],
+                ret = create_gpio_led(&led, &priv->leds[priv->num_leds],
                                       dev, NULL);
                 if (ret < 0) {
                         fwnode_handle_put(child);
                         goto err;
                 }
+                priv->num_leds++;
         }
 
         return priv;
 
 err:
-        for (count = priv->num_leds - 2; count >= 0; count--)
+        for (count = priv->num_leds - 1; count >= 0; count--)
                 delete_gpio_led(&priv->leds[count]);
         return ERR_PTR(ret);
 }