diff options
| author | Xing Zheng <zhengxing@rock-chips.com> | 2016-05-26 21:49:08 +0800 |
|---|---|---|
| committer | Xing Zheng <zhengxing@rock-chips.com> | 2016-05-27 20:07:02 +0800 |
| commit | 9608a83ed09cbd22c1681f68826153979df96f8b (patch) | |
| tree | 9a7a5599c7ea0e0f413c2573ffa17cc8f1155627 | |
| parent | 0eb5c0bea937e7a1561350479be8e9f66c6bf8fb (diff) | |
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 <lin.huang@rock-chips.com>
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from git.kernel.org mmind/linux-rockchip.git
v4.7-clk/fixes commit df43cf8f1c116f26fcfd89ce9b1119929c732597)
Change-Id: I7d21808194c914e9117c498309e4b69861799318
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
| -rw-r--r-- | drivers/clk/rockchip/clk-cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |