clk: berlin: Add of_node_put() for of_get_parent()
authorLiang He <windhl@126.com>
Fri, 8 Jul 2022 08:49:00 +0000 (16:49 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Oct 2022 10:35:04 +0000 (12:35 +0200)
[ 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
drivers/clk/berlin/bg2q.c

index bccdfa0..67a9edb 100644 (file)
@@ -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;
 
index e9518d3..dd2784b 100644 (file)
@@ -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);