Commit 95adb4e5 authored May 31, 2017 by Juri Lelli Committed by Greg Kroah-Hartman Jun 03, 2017

arm: fix return value of parse_cpu_capacity



parse_cpu_capacity() has to return 0 on failure, but it currently returns
1 instead if raw_capacity kcalloc failed.

Fix it (by directly returning 0).

Reported-by: Morten Rasmussen <morten.rasmussen@arm.com>
Fixes: 06073ee2 ('ARM: 8621/3: parse cpu capacity-dmips-mhz from DT')
Signed-off-by: Juri Lelli <juri.lelli@arm.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Vincent Guittot <vincent.guittot@linaor.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent fa081d15

arch/arm/kernel/topology.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ static int __init parse_cpu_capacity(struct device_node *cpu_node, int cpu)
		if (!raw_capacity) {
		pr_err("cpu_capacity: failed to allocate memory for raw capacities\n");
		cap_parsing_failed = true;
		return !ret;
		return 0;
		}
		}
		capacity_scale = max(cpu_capacity, capacity_scale);