summaryrefslogtreecommitdiff
path: root/drivers/clk
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2016-11-01 17:08:13 -0700
committerStephen Boyd <sboyd@codeaurora.org>2016-11-01 17:08:13 -0700
commitc7129375312732f006ba9054c12ae4d4097d5519 (patch)
treee4359c0db7f83f223a1fcc3b43c934f6f103aff4 /drivers/clk
parent5c2f117a22e46a4afee6ddee29b653a7a2a6b41f (diff)
parent4a262b14c57d6ec88982d40273e742f7b9151560 (diff)
Merge tag 'v4.9-rockchip-clkfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-fixes
Fix return value in error case of new ddrclk type. * tag 'v4.9-rockchip-clkfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: clk: rockchip: don't return NULL when failing to register ddrclk branch
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/rockchip/clk-ddr.c5
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,
ddrclk->ddr_flag = ddr_flag;
clk = clk_register(NULL, &ddrclk->hw);
- if (IS_ERR(clk)) {
- pr_err("%s: could not register ddrclk %s\n", __func__, name);
+ if (IS_ERR(clk))
kfree(ddrclk);
- return NULL;
- }
return clk;
}