aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorXing Zheng <zhengxing@rock-chips.com>2016-05-26 21:49:08 +0800
committerHeiko Stuebner <heiko@sntech.de>2016-05-30 09:40:23 +0200
commit3183c0d519ff83af2926382c11716496f01d34bf (patch)
tree5e02cf416791e7541e1e804c62eebc8e5aa602de /drivers/clk
parentclk: rockchip: Revert "clk: rockchip: reset init state before mmc card initialization" (diff)
downloadlinux-dev-3183c0d519ff83af2926382c11716496f01d34bf.tar.xz
linux-dev-3183c0d519ff83af2926382c11716496f01d34bf.zip
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>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/rockchip/clk-cpu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c
index 4bb130cd0062..05b3d73bfefa 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;
}