clk: rockchip: don't return NULL when registering inverter fails

Avoid return NULL if rockchip_clk_register_inverter fails, otherwise
rockchip_clk_register_branches print "unknown clock type". The acutal
case is that it's a known clock type but we fail to regiser it, which
may makes user confuse the reason of failure.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/drivers/clk/rockchip/clk-inverter.c b/drivers/clk/rockchip/clk-inverter.c
index 7cbf43beb3c68acf2d8e35dc6d6180bc63b7d8b2..dcb6e37f3da1e13d3d5f654d5283afbec78f0c48 100644 (file)
--- a/drivers/clk/rockchip/clk-inverter.c
+++ b/drivers/clk/rockchip/clk-inverter.c
@@ -90,7 +90,7 @@ struct clk *rockchip_clk_register_inverter(const char *name,
 
        inv_clock = kmalloc(sizeof(*inv_clock), GFP_KERNEL);
        if (!inv_clock)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        init.name = name;
        init.num_parents = num_parents;
@@ -106,11 +106,7 @@ struct clk *rockchip_clk_register_inverter(const char *name,
 
        clk = clk_register(NULL, &inv_clock->hw);
        if (IS_ERR(clk))
-               goto err_free;
+               kfree(inv_clock);
 
        return clk;
-
-err_free:
-       kfree(inv_clock);
-       return NULL;
 }