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

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;
 }