mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 01:53:29 +02:00
rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
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: Dinghao Liu <dinghao.liu@zju.edu.cn> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Link: https://lore.kernel.org/r/20201020061226.6572-1-dinghao.liu@zju.edu.cn
This commit is contained in:
parent
ba1c30bf3f
commit
28d211919e
|
|
@ -272,7 +272,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);
|
||||
|
|
@ -290,7 +290,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,
|
||||
|
|
@ -301,7 +301,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;
|
||||
|
|
@ -314,6 +314,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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user