diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-03-11 11:55:18 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2013-03-22 18:16:31 -0400 |
commit | f15ea6cbc81b1369c5eefcd8eada35057c46ab86 (patch) | |
tree | 94b332509814daafb5f654d3cfaba9525ed77ee5 /drivers/clk/clk-prima2.c | |
parent | 04981724172062029c4986e1d90732ff3c574944 (diff) |
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]
Diffstat (limited to 'drivers/clk/clk-prima2.c')
-rw-r--r-- | drivers/clk/clk-prima2.c | 2 |
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) | |||
1113 | 1113 | ||
1114 | for (i = pll1; i < maxclk; i++) { | 1114 | for (i = pll1; i < maxclk; i++) { |
1115 | prima2_clks[i] = clk_register(NULL, prima2_clk_hw_array[i]); | 1115 | prima2_clks[i] = clk_register(NULL, prima2_clk_hw_array[i]); |
1116 | BUG_ON(!prima2_clks[i]); | 1116 | BUG_ON(IS_ERR(prima2_clks[i])); |
1117 | } | 1117 | } |
1118 | clk_register_clkdev(prima2_clks[cpu], NULL, "cpu"); | 1118 | clk_register_clkdev(prima2_clks[cpu], NULL, "cpu"); |
1119 | clk_register_clkdev(prima2_clks[io], NULL, "io"); | 1119 | clk_register_clkdev(prima2_clks[io], NULL, "io"); |