Commit c7129375 authored by Stephen Boyd's avatar Stephen Boyd

Merge tag 'v4.9-rockchip-clkfixes1' of...

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
parents 5c2f117a 4a262b14
...@@ -144,11 +144,8 @@ struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, ...@@ -144,11 +144,8 @@ struct clk *rockchip_clk_register_ddrclk(const char *name, int flags,
ddrclk->ddr_flag = ddr_flag; ddrclk->ddr_flag = ddr_flag;
clk = clk_register(NULL, &ddrclk->hw); clk = clk_register(NULL, &ddrclk->hw);
if (IS_ERR(clk)) { if (IS_ERR(clk))
pr_err("%s: could not register ddrclk %s\n", __func__, name);
kfree(ddrclk); kfree(ddrclk);
return NULL;
}
return clk; return clk;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment