]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
leds: lgm-sso: Put fwnode in any case during ->probe()
authorAndy Shevchenko <andy.shevchenko@gmail.com>
Sat, 29 May 2021 11:19:26 +0000 (14:19 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Sep 2021 08:00:42 +0000 (10:00 +0200)
[ Upstream commit 9999908ca1abee7aa518a4f6a3739517c137acbf ]

fwnode_get_next_child_node() bumps a reference counting of a returned variable.
We have to balance it whenever we return to the caller.

All the same in fwnode_for_each_child_node() case.

Fixes: c3987cd2bca3 ("leds: lgm: Add LED controller driver for LGM SoC")
Cc: Amireddy Mallikarjuna reddy <mallikarjunax.reddy@linux.intel.com>
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/leds/blink/leds-lgm-sso.c

index 7d5f0bf2817ad6ee9bee4e1a79291b438083b149..2dd285052c6adf1a98b7bc48f92e2a998ea7f82d 100644 (file)
@@ -630,8 +630,10 @@ __sso_led_dt_parse(struct sso_led_priv *priv, struct fwnode_handle *fw_ssoled)
 
        fwnode_for_each_child_node(fw_ssoled, fwnode_child) {
                led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
-               if (!led)
-                       return -ENOMEM;
+               if (!led) {
+                       ret = -ENOMEM;
+                       goto __dt_err;
+               }
 
                INIT_LIST_HEAD(&led->list);
                led->priv = priv;
@@ -701,11 +703,11 @@ __sso_led_dt_parse(struct sso_led_priv *priv, struct fwnode_handle *fw_ssoled)
                if (sso_create_led(priv, led, fwnode_child))
                        goto __dt_err;
        }
-       fwnode_handle_put(fw_ssoled);
 
        return 0;
+
 __dt_err:
-       fwnode_handle_put(fw_ssoled);
+       fwnode_handle_put(fwnode_child);
        /* unregister leds */
        list_for_each(p, &priv->led_list) {
                led = list_entry(p, struct sso_led, list);
@@ -730,6 +732,7 @@ static int sso_led_dt_parse(struct sso_led_priv *priv)
        fw_ssoled = fwnode_get_named_child_node(fwnode, "ssoled");
        if (fw_ssoled) {
                ret = __sso_led_dt_parse(priv, fw_ssoled);
+               fwnode_handle_put(fw_ssoled);
                if (ret)
                        return ret;
        }