lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 472/862] clk: berlin: Add of_node_put() for of_get_parent()
    Date
    From: Liang He <windhl@126.com>

    [ Upstream commit 37c381b812dcbfde9c3f1f3d3e75fdfc1b40d5bc ]

    In berlin2_clock_setup() and berlin2q_clock_setup(), we need to
    call of_node_put() for the reference returned by of_get_parent()
    which has increased the refcount. We should call *_put() in fail
    path or when it is not used anymore.

    Fixes: 26b3b6b959b2 ("clk: berlin: prepare simple-mfd conversion")
    Signed-off-by: Liang He <windhl@126.com>
    Link: https://lore.kernel.org/r/20220708084900.311684-1-windhl@126.com
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/berlin/bg2.c | 5 ++++-
    drivers/clk/berlin/bg2q.c | 6 +++++-
    2 files changed, 9 insertions(+), 2 deletions(-)

    diff --git a/drivers/clk/berlin/bg2.c b/drivers/clk/berlin/bg2.c
    index bccdfa00fd37..67a9edbba29c 100644
    --- a/drivers/clk/berlin/bg2.c
    +++ b/drivers/clk/berlin/bg2.c
    @@ -500,12 +500,15 @@ static void __init berlin2_clock_setup(struct device_node *np)
    int n, ret;

    clk_data = kzalloc(struct_size(clk_data, hws, MAX_CLKS), GFP_KERNEL);
    - if (!clk_data)
    + if (!clk_data) {
    + of_node_put(parent_np);
    return;
    + }
    clk_data->num = MAX_CLKS;
    hws = clk_data->hws;

    gbase = of_iomap(parent_np, 0);
    + of_node_put(parent_np);
    if (!gbase)
    return;

    diff --git a/drivers/clk/berlin/bg2q.c b/drivers/clk/berlin/bg2q.c
    index e9518d35f262..dd2784bb75b6 100644
    --- a/drivers/clk/berlin/bg2q.c
    +++ b/drivers/clk/berlin/bg2q.c
    @@ -286,19 +286,23 @@ static void __init berlin2q_clock_setup(struct device_node *np)
    int n, ret;

    clk_data = kzalloc(struct_size(clk_data, hws, MAX_CLKS), GFP_KERNEL);
    - if (!clk_data)
    + if (!clk_data) {
    + of_node_put(parent_np);
    return;
    + }
    clk_data->num = MAX_CLKS;
    hws = clk_data->hws;

    gbase = of_iomap(parent_np, 0);
    if (!gbase) {
    + of_node_put(parent_np);
    pr_err("%pOF: Unable to map global base\n", np);
    return;
    }

    /* BG2Q CPU PLL is not part of global registers */
    cpupll_base = of_iomap(parent_np, 1);
    + of_node_put(parent_np);
    if (!cpupll_base) {
    pr_err("%pOF: Unable to map cpupll base\n", np);
    iounmap(gbase);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 12:50    [W:2.105 / U:0.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site