aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValentin Ilie <valentin.ilie@gmail.com>2014-04-22 09:15:54 -0400
committerMike Turquette <mturquette@linaro.org>2014-05-23 18:13:32 -0400
commit72b1c2c3a4de8891b06df18da95514d69eae65de (patch)
tree2a7838ec6d42f16d49ad0d7ac00e58fe1a9a2900
parentfe52e7505f8bf365d5ab0eeee19ababe406cbaaf (diff)
clk: st: Fix memory leak
When it fails to allocate div, gate should be free'd before return Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
-rw-r--r--drivers/clk/st/clkgen-pll.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/st/clkgen-pll.c b/drivers/clk/st/clkgen-pll.c
index bca0a0badbfa..a886702f7c8b 100644
--- a/drivers/clk/st/clkgen-pll.c
+++ b/drivers/clk/st/clkgen-pll.c
@@ -521,8 +521,10 @@ static struct clk * __init clkgen_odf_register(const char *parent_name,
521 gate->lock = odf_lock; 521 gate->lock = odf_lock;
522 522
523 div = kzalloc(sizeof(*div), GFP_KERNEL); 523 div = kzalloc(sizeof(*div), GFP_KERNEL);
524 if (!div) 524 if (!div) {
525 kfree(gate);
525 return ERR_PTR(-ENOMEM); 526 return ERR_PTR(-ENOMEM);
527 }
526 528
527 div->flags = CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO; 529 div->flags = CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO;
528 div->reg = reg + pll_data->odf[odf].offset; 530 div->reg = reg + pll_data->odf[odf].offset;