mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
clk: mvebu: add missing iounmap
Add missing iounmap to setup error path. Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
This commit is contained in:
parent
89ac8d7ae1
commit
f98d007d33
2 changed files with 15 additions and 7 deletions
|
@ -119,7 +119,7 @@ void __init of_cpu_clk_setup(struct device_node *node)
|
|||
|
||||
cpuclk = kzalloc(ncpus * sizeof(*cpuclk), GFP_KERNEL);
|
||||
if (WARN_ON(!cpuclk))
|
||||
return;
|
||||
goto cpuclk_out;
|
||||
|
||||
clks = kzalloc(ncpus * sizeof(*clks), GFP_KERNEL);
|
||||
if (WARN_ON(!clks))
|
||||
|
@ -170,6 +170,8 @@ void __init of_cpu_clk_setup(struct device_node *node)
|
|||
kfree(cpuclk[ncpus].clk_name);
|
||||
clks_out:
|
||||
kfree(cpuclk);
|
||||
cpuclk_out:
|
||||
iounmap(clock_complex_base);
|
||||
}
|
||||
|
||||
CLK_OF_DECLARE(armada_xp_cpu_clock, "marvell,armada-xp-cpu-clock",
|
||||
|
|
|
@ -45,8 +45,10 @@ void __init mvebu_coreclk_setup(struct device_node *np,
|
|||
clk_data.clk_num = 2 + desc->num_ratios;
|
||||
clk_data.clks = kzalloc(clk_data.clk_num * sizeof(struct clk *),
|
||||
GFP_KERNEL);
|
||||
if (WARN_ON(!clk_data.clks))
|
||||
if (WARN_ON(!clk_data.clks)) {
|
||||
iounmap(base);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Register TCLK */
|
||||
of_property_read_string_index(np, "clock-output-names", 0,
|
||||
|
@ -134,7 +136,7 @@ void __init mvebu_clk_gating_setup(struct device_node *np,
|
|||
|
||||
ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
|
||||
if (WARN_ON(!ctrl))
|
||||
return;
|
||||
goto ctrl_out;
|
||||
|
||||
spin_lock_init(&ctrl->lock);
|
||||
|
||||
|
@ -145,10 +147,8 @@ void __init mvebu_clk_gating_setup(struct device_node *np,
|
|||
ctrl->num_gates = n;
|
||||
ctrl->gates = kzalloc(ctrl->num_gates * sizeof(struct clk *),
|
||||
GFP_KERNEL);
|
||||
if (WARN_ON(!ctrl->gates)) {
|
||||
kfree(ctrl);
|
||||
return;
|
||||
}
|
||||
if (WARN_ON(!ctrl->gates))
|
||||
goto gates_out;
|
||||
|
||||
for (n = 0; n < ctrl->num_gates; n++) {
|
||||
const char *parent =
|
||||
|
@ -160,4 +160,10 @@ void __init mvebu_clk_gating_setup(struct device_node *np,
|
|||
}
|
||||
|
||||
of_clk_add_provider(np, clk_gating_get_src, ctrl);
|
||||
|
||||
return;
|
||||
gates_out:
|
||||
kfree(ctrl);
|
||||
ctrl_out:
|
||||
iounmap(base);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue