Received: by 2002:a05:6358:489b:b0:bb:da1:e618 with SMTP id x27csp1969103rwn; Fri, 16 Sep 2022 03:50:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ttfHYrUH/YB0o7Rr3k7Cn/Z43a4nnE/fQmXTsutClT8GOU8uMU0cFN2tBi569P8XPRob3 X-Received: by 2002:a17:907:6d1c:b0:77c:c016:19ef with SMTP id sa28-20020a1709076d1c00b0077cc01619efmr3041371ejc.689.1663325459159; Fri, 16 Sep 2022 03:50:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663325459; cv=none; d=google.com; s=arc-20160816; b=DvGoS0EULGA/3S8W9pElhr6MBmUElKwtTehBmBUkNnsoXU9iSww8lYWkBDNxkSClC+ /DYZp0IVwO+SJOG6N5LwCiMJJobq3IztYQ3KbtTA0urUWamIz5cEKNjHgnMJYpItEJSt WNd3FNs2U32vbgNuU2b27UGdnOcUgTliKJNevpP/t2unQVG1baZiWzUw2AHOhW7LwJgK JEOn9JD4J2RHSAK+70kb6W09kcKj0qn4Nz/j0hkF55TGRLNJ3/1abK2hgFeiC9XfVsz0 wg1kB7+1hPdKmws18ZHLbZwkaUOUnNyATFNSXUWAN2IfTqlaxz4ZT6RSL/jqGFpZVchF UBOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hXBMgH0Dw7b3joReb2cgsYew6rldTcpSxgqqHeZHOSI=; b=NIcah+aZsJO2aCSflhm9kDm0933w7g89YiEAXo4TPrkb5dBElyeHfGncv2idybVUfy cw0hw4sgMvZ5r0wpCnEHqlWZyiX/DGBimmvEprWgBF0Q61XsJbl7thSdlQxouXPdMEbb Oj5XO1kim4k4N3bzk3A7Beq5U5UVbZKT2EUgMUGOYCUylKFz6O2ORpaVdr4zMXsWdIeb t8ZXD4sWyiF8umXIMlcIeXdYrpTHKifrWhzpwONlsE25QOhO+DjKazhAqGrUUTJXmuuz bPZyS/d9mE3N2M8uOurpV8jjWkr2HhiCiAOmzEPN6eFSCDcg/2WkB204rY4zia8fs6nB KOJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BtvdqGUT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hg7-20020a1709072cc700b00731110cfdb8si13340858ejc.934.2022.09.16.03.50.33; Fri, 16 Sep 2022 03:50:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BtvdqGUT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231332AbiIPKLD (ORCPT + 99 others); Fri, 16 Sep 2022 06:11:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231160AbiIPKKC (ORCPT ); Fri, 16 Sep 2022 06:10:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC174AB43A; Fri, 16 Sep 2022 03:08:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3C6D8629F2; Fri, 16 Sep 2022 10:08:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A2B9C433C1; Fri, 16 Sep 2022 10:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663322924; bh=tSXfzAbEEGzejCMYQW03tijt0WD8X9cB7zVT+7xfYmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BtvdqGUT9pl1ccV7U1/bv06dWN3fBFX0utCJsk0G0iH4tjdrVgZvM+9BQ2YBeuAzf /eXycH3ioTgPUWbwNoLCnm86ERxqCimfmvPGSWf1ZmqSTRfTkF9QO+d0/gk5JIS2+1 +TX/8h9gUUyMEiO5hWHFMULxKRMqSLNG3OnJ76jc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yu Zhe , Will Deacon , Sasha Levin Subject: [PATCH 4.19 06/11] perf/arm_pmu_platform: fix tests for platform_get_irq() failure Date: Fri, 16 Sep 2022 12:08:02 +0200 Message-Id: <20220916100442.972317619@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100442.662955946@linuxfoundation.org> References: <20220916100442.662955946@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yu Zhe [ Upstream commit 6bb0d64c100091e131cd16710b62fda3319cd0af ] The platform_get_irq() returns negative error codes. It can't actually return zero. Signed-off-by: Yu Zhe Link: https://lore.kernel.org/r/20220825011844.8536-1-yuzhe@nfschina.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/arm_pmu_platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/perf/arm_pmu_platform.c b/drivers/perf/arm_pmu_platform.c index 199293450acfc..0ffa4f45a8391 100644 --- a/drivers/perf/arm_pmu_platform.c +++ b/drivers/perf/arm_pmu_platform.c @@ -118,7 +118,7 @@ static int pmu_parse_irqs(struct arm_pmu *pmu) if (num_irqs == 1) { int irq = platform_get_irq(pdev, 0); - if (irq && irq_is_percpu_devid(irq)) + if ((irq > 0) && irq_is_percpu_devid(irq)) return pmu_parse_percpu_irq(pmu, irq); } -- 2.35.1