lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 658/800] leds: lm3692x: Put fwnode in any case during ->probe()
    Date
    From: Andy Shevchenko <andy.shevchenko@gmail.com>

    [ Upstream commit f55db1c7fadc2a29c9fa4ff3aec98dbb111f2206 ]

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

    Fixes: 9a5c1c64ac0a ("leds: lm3692x: Change DT calls to fwnode calls")
    Cc: Dan Murphy <dmurphy@ti.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/leds-lm3692x.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/leds/leds-lm3692x.c b/drivers/leds/leds-lm3692x.c
    index e945de45388c..55e6443997ec 100644
    --- a/drivers/leds/leds-lm3692x.c
    +++ b/drivers/leds/leds-lm3692x.c
    @@ -435,6 +435,7 @@ static int lm3692x_probe_dt(struct lm3692x_led *led)

    ret = fwnode_property_read_u32(child, "reg", &led->led_enable);
    if (ret) {
    + fwnode_handle_put(child);
    dev_err(&led->client->dev, "reg DT property missing\n");
    return ret;
    }
    @@ -449,12 +450,11 @@ static int lm3692x_probe_dt(struct lm3692x_led *led)

    ret = devm_led_classdev_register_ext(&led->client->dev, &led->led_dev,
    &init_data);
    - if (ret) {
    + if (ret)
    dev_err(&led->client->dev, "led register err: %d\n", ret);
    - return ret;
    - }

    - return 0;
    + fwnode_handle_put(init_data.fwnode);
    + return ret;
    }

    static int lm3692x_probe(struct i2c_client *client,
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 11:09    [W:4.021 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site