diff options
author | Shawn Lin <shawn.lin@rock-chips.com> | 2016-10-12 08:31:41 -0400 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2016-10-15 20:39:58 -0400 |
commit | 4a262b14c57d6ec88982d40273e742f7b9151560 (patch) | |
tree | 52a611fe7432d3c5c0133162ea28759c538954dc | |
parent | 1001354ca34179f3db924eb66672442a173147dc (diff) |
clk: rockchip: don't return NULL when failing to register ddrclk branch
rockchip_clk_register_ddrclk should not return NULL when failing
to call clk_register, otherwise rockchip_clk_register_branches
prints "unknown clock type". The actual case is that it's a known
clock type but we fail to register it, which may makes user confuse
the reason of failure. And the pr_err here is pointless as
rockchip_clk_register_branches will also print the similar message.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r-- | drivers/clk/rockchip/clk-ddr.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c index 8feba93672c5..e8075359366b 100644 --- a/drivers/clk/rockchip/clk-ddr.c +++ b/drivers/clk/rockchip/clk-ddr.c | |||
@@ -144,11 +144,8 @@ struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, | |||
144 | ddrclk->ddr_flag = ddr_flag; | 144 | ddrclk->ddr_flag = ddr_flag; |
145 | 145 | ||
146 | clk = clk_register(NULL, &ddrclk->hw); | 146 | clk = clk_register(NULL, &ddrclk->hw); |
147 | if (IS_ERR(clk)) { | 147 | if (IS_ERR(clk)) |
148 | pr_err("%s: could not register ddrclk %s\n", __func__, name); | ||
149 | kfree(ddrclk); | 148 | kfree(ddrclk); |
150 | return NULL; | ||
151 | } | ||
152 | 149 | ||
153 | return clk; | 150 | return clk; |
154 | } | 151 | } |