From: Xing Zheng Date: Thu, 26 May 2016 13:49:08 +0000 (+0800) Subject: UPSTREAM: clk: rockchip: fix cpuclk registration error handling X-Git-Tag: firefly_0821_release~2607 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9608a83ed09cbd22c1681f68826153979df96f8b;p=firefly-linux-kernel-4.4.55.git UPSTREAM: clk: rockchip: fix cpuclk registration error handling It maybe due to a copy-paste error the error handing should be cclk not clk when checking if the cpuclk registration succeeded. Reported-by: Lin Huang Signed-off-by: Xing Zheng Signed-off-by: Heiko Stuebner (cherry picked from git.kernel.org mmind/linux-rockchip.git v4.7-clk/fixes commit df43cf8f1c116f26fcfd89ce9b1119929c732597) Change-Id: I7d21808194c914e9117c498309e4b69861799318 Signed-off-by: Xing Zheng --- diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c index 2ce5e71102d4..4b366a3691a4 100644 --- a/drivers/clk/rockchip/clk-cpu.c +++ b/drivers/clk/rockchip/clk-cpu.c @@ -321,9 +321,9 @@ struct clk *rockchip_clk_register_cpuclk(const char *name, } cclk = clk_register(NULL, &cpuclk->hw); - if (IS_ERR(clk)) { + if (IS_ERR(cclk)) { pr_err("%s: could not register cpuclk %s\n", __func__, name); - ret = PTR_ERR(clk); + ret = PTR_ERR(cclk); goto free_rate_table; }