[PATCH 1/2] ARM: cpuidle: fix !cpuidle_ops[cpu].init case during init

Jisheng Zhang jszhang at marvell.com
Wed Mar 23 22:11:08 PDT 2016


Let's assume cpuidle_ops exists but it doesn't implement the according
init member, current arm_cpuidle_init() will return success to its
caller, but in fact it should return -EOPNOTSUPP.

Signed-off-by: Jisheng Zhang <jszhang at marvell.com>
---
 arch/arm/kernel/cpuidle.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
index 703926e..f108d8f 100644
--- a/arch/arm/kernel/cpuidle.c
+++ b/arch/arm/kernel/cpuidle.c
@@ -143,8 +143,12 @@ int __init arm_cpuidle_init(int cpu)
 		return -ENODEV;
 
 	ret = arm_cpuidle_read_ops(cpu_node, cpu);
-	if (!ret && cpuidle_ops[cpu].init)
-		ret = cpuidle_ops[cpu].init(cpu_node, cpu);
+	if (!ret) {
+		if (cpuidle_ops[cpu].init)
+			ret = cpuidle_ops[cpu].init(cpu_node, cpu);
+		else
+			ret = -EOPNOTSUPP;
+	}
 
 	of_node_put(cpu_node);
 
-- 
2.8.0.rc3




More information about the linux-arm-kernel mailing list