| Message ID | 20170327131825.32134-4-juri.lelli@arm.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 27 March 2017 at 15:18, 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 removing the negation of the return value. > > 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> > --- > 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..4e4af809606a 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 ret; Why not directly returning 0 ? whatever the value of ret, the parse of cpu capacity has failed in this case > } > } > capacity_scale = max(cpu_capacity, capacity_scale); > -- > 2.10.0 >
On 29/03/17 09:37, Vincent Guittot wrote: > On 27 March 2017 at 15:18, 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 removing the negation of the return value. > > > > 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> > > --- > > 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..4e4af809606a 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 ret; > > Why not directly returning 0 ? whatever the value of ret, the parse of > cpu capacity has failed in this case > Sure, can change that. Thanks, - Juri
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index f8a3ab82e77f..4e4af809606a 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 ret; } } 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 removing the negation of the return value. 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> --- arch/arm/kernel/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)