lkml.org 
[lkml]   [2021]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 154/334] leds: lgm-sso: Put fwnode in any case during ->probe()
    Date
    From: Andy Shevchenko <andy.shevchenko@gmail.com>

    [ 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 | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    diff --git a/drivers/leds/blink/leds-lgm-sso.c b/drivers/leds/blink/leds-lgm-sso.c
    index 7eb2f44f16be..62ce83cea553 100644
    --- a/drivers/leds/blink/leds-lgm-sso.c
    +++ b/drivers/leds/blink/leds-lgm-sso.c
    @@ -631,8 +631,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;
    @@ -702,11 +704,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);
    @@ -731,6 +733,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;
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-13 16:37    [W:4.112 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site