|
@@ -57,6 +57,7 @@ static struct clk *rockchip_clk_register_branch(const char *name,
|
|
|
struct clk_divider *div = NULL;
|
|
|
const struct clk_ops *mux_ops = NULL, *div_ops = NULL,
|
|
|
*gate_ops = NULL;
|
|
|
+ int ret;
|
|
|
|
|
|
if (num_parents > 1) {
|
|
|
mux = kzalloc(sizeof(*mux), GFP_KERNEL);
|
|
@@ -74,8 +75,10 @@ static struct clk *rockchip_clk_register_branch(const char *name,
|
|
|
|
|
|
if (gate_offset >= 0) {
|
|
|
gate = kzalloc(sizeof(*gate), GFP_KERNEL);
|
|
|
- if (!gate)
|
|
|
+ if (!gate) {
|
|
|
+ ret = -ENOMEM;
|
|
|
goto err_gate;
|
|
|
+ }
|
|
|
|
|
|
gate->flags = gate_flags;
|
|
|
gate->reg = base + gate_offset;
|
|
@@ -86,8 +89,10 @@ static struct clk *rockchip_clk_register_branch(const char *name,
|
|
|
|
|
|
if (div_width > 0) {
|
|
|
div = kzalloc(sizeof(*div), GFP_KERNEL);
|
|
|
- if (!div)
|
|
|
+ if (!div) {
|
|
|
+ ret = -ENOMEM;
|
|
|
goto err_div;
|
|
|
+ }
|
|
|
|
|
|
div->flags = div_flags;
|
|
|
div->reg = base + muxdiv_offset;
|
|
@@ -106,12 +111,19 @@ static struct clk *rockchip_clk_register_branch(const char *name,
|
|
|
gate ? &gate->hw : NULL, gate_ops,
|
|
|
flags);
|
|
|
|
|
|
+ if (IS_ERR(clk)) {
|
|
|
+ ret = PTR_ERR(clk);
|
|
|
+ goto err_composite;
|
|
|
+ }
|
|
|
+
|
|
|
return clk;
|
|
|
+err_composite:
|
|
|
+ kfree(div);
|
|
|
err_div:
|
|
|
kfree(gate);
|
|
|
err_gate:
|
|
|
kfree(mux);
|
|
|
- return ERR_PTR(-ENOMEM);
|
|
|
+ return ERR_PTR(ret);
|
|
|
}
|
|
|
|
|
|
struct rockchip_clk_frac {
|
|
@@ -291,8 +303,10 @@ static struct clk *rockchip_clk_register_frac_branch(
|
|
|
init.num_parents = child->num_parents;
|
|
|
|
|
|
mux_clk = clk_register(NULL, &frac_mux->hw);
|
|
|
- if (IS_ERR(mux_clk))
|
|
|
+ if (IS_ERR(mux_clk)) {
|
|
|
+ kfree(frac);
|
|
|
return clk;
|
|
|
+ }
|
|
|
|
|
|
rockchip_clk_add_lookup(ctx, mux_clk, child->id);
|
|
|
|