summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-03-11 16:55:18 +0100
committerMike Turquette <mturquette@linaro.org>2013-03-22 23:16:31 +0100
commitf15ea6cbc81b1369c5eefcd8eada35057c46ab86 (patch)
tree94b332509814daafb5f654d3cfaba9525ed77ee5
parentclk:SPEAr1340: Correct parent clock configuration (diff)
downloadlinux-f15ea6cbc81b1369c5eefcd8eada35057c46ab86.tar.xz
linux-f15ea6cbc81b1369c5eefcd8eada35057c46ab86.zip
clk: prima2: fix return value check in sirfsoc_of_clk_init()
In case of error, the function clk_get() returns ERR_PTR() not NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Barry Song <21cnbao@gmail.com> Signed-off-by: Mike Turquette <mturquette@linaro.org> [mturquette@linaro.org: added missing parenthesis to fix compile break]
-rw-r--r--drivers/clk/clk-prima2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-prima2.c b/drivers/clk/clk-prima2.c
index f8e9d0c27be2..643ca653fef0 100644
--- a/drivers/clk/clk-prima2.c
+++ b/drivers/clk/clk-prima2.c
@@ -1113,7 +1113,7 @@ void __init sirfsoc_of_clk_init(void)
for (i = pll1; i < maxclk; i++) {
prima2_clks[i] = clk_register(NULL, prima2_clk_hw_array[i]);
- BUG_ON(!prima2_clks[i]);
+ BUG_ON(IS_ERR(prima2_clks[i]));
}
clk_register_clkdev(prima2_clks[cpu], NULL, "cpu");
clk_register_clkdev(prima2_clks[io], NULL, "io");