From patchwork Mon May 31 13:15:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 450522 Delivered-To: patch@linaro.org Received: by 2002:a02:c735:0:0:0:0:0 with SMTP id h21csp899900jao; Mon, 31 May 2021 07:56:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxx00EVqy9ULBtnHH5Y/N0aXVx18Zbl/GrX0g4kWFg53p5kwhSJ+IlF0nAZJi+WLy6AbKFR X-Received: by 2002:a17:906:1113:: with SMTP id h19mr14100276eja.398.1622472966920; Mon, 31 May 2021 07:56:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622472966; cv=none; d=google.com; s=arc-20160816; b=y20f9j4Rogcxc5ZZj7tH1d6i6r739GgyWJX6riMLJEhk5ZQL0Hofdt9wKyKFIo3QVk kYJ4qR8r2GHAkMpr7fQNlMkciJUuk4lhPDchYNnUONvKtryzlh44pgvmRrznT/BtpRxm fWinpr8Ubx4lKWCx8qfFMa3rIrWpwAN/18W7x3hJJdBuZa/T05IfT5v1EYGA6jWOtpXD zD3OlkfdNlOnLIwyDZGmN1jq60WpHCz5231AeYg6lqpO+8waX/wCl7kSFrVMAc6nD6FL 2WkYn19HIOa5zQU3Yn3OfhKQT/CyrtDxpBVgM8h+JbGWMpIaN6Ylspzo41cbSIEgmRmb dLWg== 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=FUrKJxa8hGpEc720NQXRvl96O3oHU6s80Cvp1/XhSug=; b=C3EylVeeNJ7EhZMuDK8UDYBKpxTCuJy0d/GJHsVWXnc8Vy93OUi/RophUTlj+7YH0D qJECK7qgkA/tcDkW/djo6c0PxkjZBBAkWa3zTrCcGVlaydXTOL97DFoHdipNEra0e1fE ezDdP2j1cAc5jsxHarP8bMttBONWDk9P2Ic2ziDznSIRHlJnvmYSZgrWmBFdgQSVlF6Q jn/hxdHUbQ5YTQQ8KdCybO048Y9y86XC73NRDgQBqWZaFMeNlYYBgLp4S4+cplKV6Nph K2xcXfnj43qpqPXxnftzhWuHTLlont0j3RRSs0vI6JYjBSrrGVnW0bNuP4xymtLIqtQk jZ6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=L7011UfQ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id nb27si12756330ejc.548.2021.05.31.07.56.06; Mon, 31 May 2021 07:56:06 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=L7011UfQ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S233375AbhEaO5k (ORCPT + 12 others); Mon, 31 May 2021 10:57:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:48180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232741AbhEaOza (ORCPT ); Mon, 31 May 2021 10:55:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A631B61933; Mon, 31 May 2021 13:59:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622469583; bh=DQknK+guMV8EB2YI3n8n9bEN8CPrQG+Hf0znxpFfcVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L7011UfQa0gT6HJHpW76D3+gGKaQNDYX4iBIeledKGo97sFJUJGkZ7cVhxp3zLied yQvnjkWyEd+81h6ax2hIVvogKY55Ucy+HrBLgfSwgyBl5FH82Ms6PKTDHA5/1qSY54 Q9rVxBEdsfuto7IJR0lMukavdWteUboBzFnSH0O0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Michael Chan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.12 246/296] net: bnx2: Fix error return code in bnx2_init_board() Date: Mon, 31 May 2021 15:15:01 +0200 Message-Id: <20210531130712.050769987@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130703.762129381@linuxfoundation.org> References: <20210531130703.762129381@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit 28c66b6da4087b8cfe81c2ec0a46eb6116dafda9 ] Fix to return -EPERM from the error handling case instead of 0, as done elsewhere in this function. Fixes: b6016b767397 ("[BNX2]: New Broadcom gigabit network driver.") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Reviewed-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnx2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 3e8a179f39db..633b10389653 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -8247,9 +8247,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) BNX2_WR(bp, PCI_COMMAND, reg); } else if ((BNX2_CHIP_ID(bp) == BNX2_CHIP_ID_5706_A1) && !(bp->flags & BNX2_FLAG_PCIX)) { - dev_err(&pdev->dev, "5706 A1 can only be used in a PCIX bus, aborting\n"); + rc = -EPERM; goto err_out_unmap; }