aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Pena <felipensp@gmail.com>2013-10-07 22:25:44 -0400
committerMike Turquette <mturquette@linaro.org>2013-10-08 01:43:27 -0400
commitf8fe36f6083a70270a7305f7740b124ff1e8aea7 (patch)
tree76e9295d55457953e2c9f597649ee664bf4de684
parent6cfc229d6f967041b5e1ee56a5bb87a500f31311 (diff)
clk/zynq: Fix possible memory leak
The zynq_clk_register_fclk function can leak memory (fclk_lock) when unable to alloc memory for fclk_gate_lock Signed-off-by: Felipe Pena <felipensp@gmail.com> Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
-rw-r--r--drivers/clk/zynq/clkc.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index cc40fe64f2dc..10772aa72e4e 100644
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@ -117,13 +117,19 @@ static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
117 goto err; 117 goto err;
118 fclk_gate_lock = kmalloc(sizeof(*fclk_gate_lock), GFP_KERNEL); 118 fclk_gate_lock = kmalloc(sizeof(*fclk_gate_lock), GFP_KERNEL);
119 if (!fclk_gate_lock) 119 if (!fclk_gate_lock)
120 goto err; 120 goto err_fclk_gate_lock;
121 spin_lock_init(fclk_lock); 121 spin_lock_init(fclk_lock);
122 spin_lock_init(fclk_gate_lock); 122 spin_lock_init(fclk_gate_lock);
123 123
124 mux_name = kasprintf(GFP_KERNEL, "%s_mux", clk_name); 124 mux_name = kasprintf(GFP_KERNEL, "%s_mux", clk_name);
125 if (!mux_name)
126 goto err_mux_name;
125 div0_name = kasprintf(GFP_KERNEL, "%s_div0", clk_name); 127 div0_name = kasprintf(GFP_KERNEL, "%s_div0", clk_name);
128 if (!div0_name)
129 goto err_div0_name;
126 div1_name = kasprintf(GFP_KERNEL, "%s_div1", clk_name); 130 div1_name = kasprintf(GFP_KERNEL, "%s_div1", clk_name);
131 if (!div1_name)
132 goto err_div1_name;
127 133
128 clk = clk_register_mux(NULL, mux_name, parents, 4, 134 clk = clk_register_mux(NULL, mux_name, parents, 4,
129 CLK_SET_RATE_NO_REPARENT, fclk_ctrl_reg, 4, 2, 0, 135 CLK_SET_RATE_NO_REPARENT, fclk_ctrl_reg, 4, 2, 0,
@@ -147,6 +153,14 @@ static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
147 153
148 return; 154 return;
149 155
156err_div1_name:
157 kfree(div0_name);
158err_div0_name:
159 kfree(mux_name);
160err_mux_name:
161 kfree(fclk_gate_lock);
162err_fclk_gate_lock:
163 kfree(fclk_lock);
150err: 164err:
151 clks[fclk] = ERR_PTR(-ENOMEM); 165 clks[fclk] = ERR_PTR(-ENOMEM);
152} 166}