summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2014-07-22 22:18:08 +0800
committerJason Cooper <jason@lakedaemon.net>2014-07-23 12:31:13 +0000
commitb03e119fff8a06f55faaaa11c6259829fe81cbb4 (patch)
tree17da421708cd39346b57614ca8678aecb1b03513
parentba3ec5780bba27819bbc4f669e6c77418a00f14b (diff)
downloadtalos-obmc-linux-b03e119fff8a06f55faaaa11c6259829fe81cbb4.tar.gz
talos-obmc-linux-b03e119fff8a06f55faaaa11c6259829fe81cbb4.zip
ARM: mvebu: fix return value check in armada_xp_pmsu_cpufreq_init()
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 <yongjun_wei@trendmicro.com.cn> Link: https://lkml.kernel.org/r/1406038688-26417-1-git-send-email-weiyj_lk@163.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/mach-mvebu/pmsu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c
index 0ca285fdd569..0b617ae3ceb9 100644
--- a/arch/arm/mach-mvebu/pmsu.c
+++ b/arch/arm/mach-mvebu/pmsu.c
@@ -424,9 +424,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);
}
/*
OpenPOWER on IntegriCloud