Commit c7129375 authored Nov 01, 2016 by 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

drivers/clk/rockchip/clk-ddr.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}