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

Commit 569da7c3 authored by Dinghao Liu's avatar Dinghao Liu Committed by Greg Kroah-Hartman
Browse files

rtc: sun6i: Fix memleak in sun6i_rtc_clk_init 



[ Upstream commit 28d211919e422f58c1e6c900e5810eee4f1ce4c8 ]

When clk_hw_register_fixed_rate_with_accuracy() fails,
clk_data should be freed. It's the same for the subsequent
two error paths, but we should also unregister the already
registered clocks in them.

Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20201020061226.6572-1-dinghao.liu@zju.edu.cn


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 642c2d74

drivers/rtc/rtc-sun6i.c

+5 −3
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, 
								300000000);

	if (IS_ERR(rtc->int_osc)) {

		pr_crit("Couldn't register the internal oscillator\n");

		return;

		goto err;

	}



	parents[0] = clk_hw_get_name(rtc->int_osc);
@@ -292,7 +292,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, 
	rtc->losc = clk_register(NULL, &rtc->hw);

	if (IS_ERR(rtc->losc)) {

		pr_crit("Couldn't register the LOSC clock\n");

		return;

		goto err_register;

	}



	of_property_read_string_index(node, "clock-output-names", 1,
@@ -303,7 +303,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, 
					  &rtc->lock);

	if (IS_ERR(rtc->ext_losc)) {

		pr_crit("Couldn't register the LOSC external gate\n");

		return;

		goto err_register;

	}



	clk_data->num = 2;
@@ -316,6 +316,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, 
	of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);

	return;



err_register:

	clk_hw_unregister_fixed_rate(rtc->int_osc);

err:

	kfree(clk_data);

}