diff options
| -rw-r--r-- | drivers/clk/zynq/clkc.c | 16 |
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 | ||
| 156 | err_div1_name: | ||
| 157 | kfree(div0_name); | ||
| 158 | err_div0_name: | ||
| 159 | kfree(mux_name); | ||
| 160 | err_mux_name: | ||
| 161 | kfree(fclk_gate_lock); | ||
| 162 | err_fclk_gate_lock: | ||
| 163 | kfree(fclk_lock); | ||
| 150 | err: | 164 | err: |
| 151 | clks[fclk] = ERR_PTR(-ENOMEM); | 165 | clks[fclk] = ERR_PTR(-ENOMEM); |
| 152 | } | 166 | } |
