From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEE12C433F5 for ; Mon, 25 Oct 2021 17:00:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D97D060FBF for ; Mon, 25 Oct 2021 17:00:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234305AbhJYRCl (ORCPT ); Mon, 25 Oct 2021 13:02:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:54904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234257AbhJYRC2 (ORCPT ); Mon, 25 Oct 2021 13:02:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BB9FB60FE8; Mon, 25 Oct 2021 17:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635181205; bh=zymw0Cd5SrCynRtyeFd4YXZw31nviPLgRFKiy/lGjyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kGusySnBrcEH1kClVP8c9Al/x4OWy6Yj2GX9+EKYK4myG7l8qfr2dg3yb195B0b+k QGgJcKVdGzh4lfeZ7sBBds10E/xnR9NzIBuG7ejj+Pdpu3GumEsX9/UMJIugr7HTfD tmV9OSAWlhSQPv1bV7x+z0KRxC58/KIfeVa3CweGTD/b+VJPUq9SNknFr3MLDc/t4y KwMkSuYeTJWwM4JEZGg+Lh0xjx0sBnTw3Kp7F5mWoALoWSLnObZLj4SVjONCUmEzqz weRILJCruY9Tr4KepVmVRfUI0kL9PqSYTuXeCx9yA+luF+raKFlZrQ3cUb65Qimfre qRKWT3Z9WVYUA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheyu Ma , "David S . Miller" , Sasha Levin , sgoutham@marvell.com, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 09/18] cavium: Return negative value when pci_alloc_irq_vectors() fails Date: Mon, 25 Oct 2021 12:59:22 -0400 Message-Id: <20211025165939.1393655-9-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211025165939.1393655-1-sashal@kernel.org> References: <20211025165939.1393655-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zheyu Ma [ Upstream commit b2cddb44bddc1a9c5949a978bb454bba863264db ] During the process of driver probing, the probe function should return < 0 for failure, otherwise, the kernel will treat value > 0 as success. Signed-off-by: Zheyu Ma Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/cavium/thunder/nic_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c index 9361f964bb9b..816453a4f8d6 100644 --- a/drivers/net/ethernet/cavium/thunder/nic_main.c +++ b/drivers/net/ethernet/cavium/thunder/nic_main.c @@ -1193,7 +1193,7 @@ static int nic_register_interrupts(struct nicpf *nic) dev_err(&nic->pdev->dev, "Request for #%d msix vectors failed, returned %d\n", nic->num_vec, ret); - return 1; + return ret; } /* Register mailbox interrupt handler */ -- 2.33.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91BE1C433F5 for ; Mon, 25 Oct 2021 17:01:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 63C8860F9D for ; Mon, 25 Oct 2021 17:01:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 63C8860F9D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HPnCdcMm1lo7xT2WuufXYxIE9qtsWLYhXaS9EOyGyO4=; b=MhYGNrd8lYvexc wCrkSsphFyg9WD7oduTT7kYFSkMzrf0XWu/x/uzvV7Y/hESo6eA3PVWDKXsdhjvuyx13oCCyQ9Oj9 0+Ys+zDS1m9fST9A97aFsbWsokirzWCKly3+6CSbQbookD+4zkqFyWvdfkpCDqDqhpYJ9Sywa56le U3Tx+i0kNHhsYUE57wSFg6Fi+hPWuWKgb36IQIQXjJqJRcY48Z9lqJXaU7WHuHObyZOyo0jgbVDCm RG7mvUw8aJ0lo+lvKTRfKf9R+OvYV1aQAMsUiqIgEkwyO8UpsBjJ6WOrFuNmqqDOl5MUuUu1rhL6C llR4EDz+NENI4L33HMig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mf3Kl-00H8QN-HG; Mon, 25 Oct 2021 17:00:27 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mf3KQ-00H8In-4X for linux-arm-kernel@lists.infradead.org; Mon, 25 Oct 2021 17:00:07 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id BB9FB60FE8; Mon, 25 Oct 2021 17:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635181205; bh=zymw0Cd5SrCynRtyeFd4YXZw31nviPLgRFKiy/lGjyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kGusySnBrcEH1kClVP8c9Al/x4OWy6Yj2GX9+EKYK4myG7l8qfr2dg3yb195B0b+k QGgJcKVdGzh4lfeZ7sBBds10E/xnR9NzIBuG7ejj+Pdpu3GumEsX9/UMJIugr7HTfD tmV9OSAWlhSQPv1bV7x+z0KRxC58/KIfeVa3CweGTD/b+VJPUq9SNknFr3MLDc/t4y KwMkSuYeTJWwM4JEZGg+Lh0xjx0sBnTw3Kp7F5mWoALoWSLnObZLj4SVjONCUmEzqz weRILJCruY9Tr4KepVmVRfUI0kL9PqSYTuXeCx9yA+luF+raKFlZrQ3cUb65Qimfre qRKWT3Z9WVYUA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheyu Ma , "David S . Miller" , Sasha Levin , sgoutham@marvell.com, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 09/18] cavium: Return negative value when pci_alloc_irq_vectors() fails Date: Mon, 25 Oct 2021 12:59:22 -0400 Message-Id: <20211025165939.1393655-9-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211025165939.1393655-1-sashal@kernel.org> References: <20211025165939.1393655-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211025_100006_238122_A2FF6656 X-CRM114-Status: GOOD ( 10.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Zheyu Ma [ Upstream commit b2cddb44bddc1a9c5949a978bb454bba863264db ] During the process of driver probing, the probe function should return < 0 for failure, otherwise, the kernel will treat value > 0 as success. Signed-off-by: Zheyu Ma Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/cavium/thunder/nic_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c index 9361f964bb9b..816453a4f8d6 100644 --- a/drivers/net/ethernet/cavium/thunder/nic_main.c +++ b/drivers/net/ethernet/cavium/thunder/nic_main.c @@ -1193,7 +1193,7 @@ static int nic_register_interrupts(struct nicpf *nic) dev_err(&nic->pdev->dev, "Request for #%d msix vectors failed, returned %d\n", nic->num_vec, ret); - return 1; + return ret; } /* Register mailbox interrupt handler */ -- 2.33.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel