Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S946482AbdDTOue (ORCPT ); Thu, 20 Apr 2017 10:50:34 -0400 Received: from mail-oi0-f51.google.com ([209.85.218.51]:33377 "EHLO mail-oi0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S946430AbdDTOuY (ORCPT ); Thu, 20 Apr 2017 10:50:24 -0400 MIME-Version: 1.0 In-Reply-To: <20170420144316.15632-4-juri.lelli@arm.com> References: <20170420144316.15632-1-juri.lelli@arm.com> <20170420144316.15632-4-juri.lelli@arm.com> From: Vincent Guittot Date: Thu, 20 Apr 2017 16:50:03 +0200 Message-ID: Subject: Re: [PATCH v4 3/8] arm: fix return value of parse_cpu_capacity To: Juri Lelli Cc: linux-kernel , "linux-pm@vger.kernel.org" , LAK , "devicetree@vger.kernel.org" , Peter Zijlstra , Rob Herring , Mark Rutland , Russell King - ARM Linux , Sudeep Holla , Lorenzo Pieralisi , Catalin Marinas , Will Deacon , Morten Rasmussen , Dietmar Eggemann , Mark Brown , "gregkh@linuxfoundation.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1469 Lines: 38 On 20 April 2017 at 16:43, 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 > Reported-by: Morten Rasmussen > Fixes: 06073ee26775 ('ARM: 8621/3: parse cpu capacity-dmips-mhz from DT') > Signed-off-by: Juri Lelli > Acked-by: Russell King > --- > > 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 > } > } > capacity_scale = max(cpu_capacity, capacity_scale); > -- > 2.10.0 >