| Message ID | 20170420144316.15632-4-juri.lelli@arm.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 20 April 2017 at 16:43, Juri Lelli <juri.lelli@arm.com> 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 <linux@arm.linux.org.uk> > 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> > --- > > Changes from v3: > > - directly return 0 on failure (as pointed out by Vincent) > --- > 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; Acked-by: Vincent Guittot <vincent.guittot@linaor.org> > } > } > capacity_scale = max(cpu_capacity, capacity_scale); > -- > 2.10.0 >
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);
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 <linux@arm.linux.org.uk> 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> --- Changes from v3: - directly return 0 on failure (as pointed out by Vincent) --- arch/arm/kernel/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)