2014-07-22 14:19:46

by weiyj_lk

Subject: [PATCH -next] ARM: mvebu: fix return value check in armada_xp_pmsu_cpufreq_init()

From: Wei Yongjun <[email protected]>

In case of error, the function clk_get() returns ERR_PTR()
and never returns NULL. The NULL test in the return value
check should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <[email protected]>
---
arch/arm/mach-mvebu/pmsu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c
index c30b7d7..4f6ef6e 100644
--- a/arch/arm/mach-mvebu/pmsu.c
+++ b/arch/arm/mach-mvebu/pmsu.c
@@ -637,9 +637,9 @@ static int __init armada_xp_pmsu_cpufreq_init(void)
}

clk = clk_get(cpu_dev, 0);
- if (!clk) {
+ if (IS_ERR(clk)) {
pr_err("Cannot get clock for CPU %d\n", cpu);
- return -ENODEV;
+ return PTR_ERR(clk);
}

/*

2014-07-23 12:33:02

by Jason Cooper

Subject: Re: [PATCH -next] ARM: mvebu: fix return value check in armada_xp_pmsu_cpufreq_init()

On Tue, Jul 22, 2014 at 10:18:08PM +0800, [email protected] wrote:
> From: Wei Yongjun <[email protected]>
>
> In case of error, the function clk_get() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value
> check should be replaced with IS_ERR().
>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> arch/arm/mach-mvebu/pmsu.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Applied to mvebu/soc.

thx,

Jason.