Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa3898de authored by Liang He's avatar Liang He Committed by Greg Kroah-Hartman
Browse files

clk: berlin: Add of_node_put() for of_get_parent() 



[ 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: 26b3b6b9 ("clk: berlin: prepare simple-mfd conversion")
Signed-off-by: default avatarLiang He <windhl@126.com>
Link: https://lore.kernel.org/r/20220708084900.311684-1-windhl@126.com


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fcaff9bc

drivers/clk/berlin/bg2.c

+4 −1
Original line number Diff line number Diff line
@@ -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;

drivers/clk/berlin/bg2q.c

+5 −1
Original line number Diff line number Diff line
@@ -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);