[PATCH v5 2/7] arm: fix return value of parse_cpu_capacity
From: linux@armlinux.org.uk (Russell King - ARM Linux)
Date: 2017-05-31 18:40:24
Also in:
linux-devicetree, linux-pm, lkml
On Wed, May 31, 2017 at 05:59:26PM +0100, Juri Lelli wrote:
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). Cc: Russell King <redacted>
You can drop these Cc's now. Thanks.
quoted hunk ↗ jump to hunk
Reported-by: Morten Rasmussen <redacted> Fixes: 06073ee26775 ('ARM: 8621/3: parse cpu capacity-dmips-mhz from DT') Signed-off-by: Juri Lelli <redacted> Acked-by: Russell King <redacted> Acked-by: Vincent Guittot <redacted> --- arch/arm/kernel/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index f8a3ab82e77f..1b8ec3054642 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c@@ -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);-- 2.11.0
-- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.