diff options
author | Shawn Lin <shawn.lin@rock-chips.com> | 2016-02-15 11:33:33 +0800 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2016-02-15 23:35:20 +0100 |
commit | ddd02e145611d1689e5014e79d7f37dcd323b70b (patch) | |
tree | 8a19b9b24545feefb15d4ebd5756c5447f6f33f1 /drivers/clk/rockchip/clk-inverter.c | |
parent | eb4e10c61ddb513dae6508a16eedd2da59effb98 (diff) | |
download | op-kernel-dev-ddd02e145611d1689e5014e79d7f37dcd323b70b.zip op-kernel-dev-ddd02e145611d1689e5014e79d7f37dcd323b70b.tar.gz |
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>
Diffstat (limited to 'drivers/clk/rockchip/clk-inverter.c')
-rw-r--r-- | drivers/clk/rockchip/clk-inverter.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/clk/rockchip/clk-inverter.c b/drivers/clk/rockchip/clk-inverter.c index 7cbf43b..dcb6e37 100644 --- 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; } |