]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
arm: fix return value of parse_cpu_capacity
authorJuri Lelli <juri.lelli@arm.com>
Wed, 31 May 2017 16:59:26 +0000 (17:59 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Jun 2017 10:10:08 +0000 (19:10 +0900)
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: 06073ee26775 ('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>
arch/arm/kernel/topology.c

index f8a3ab82e77f511200a25e5bad8394b61c2159de..1b8ec3054642074597a0c7a82d0ced42331c2c7b 100644 (file)
@@ -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);