From patchwork Mon May 31 13:14:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 450494 Delivered-To: patch@linaro.org Received: by 2002:a02:c735:0:0:0:0:0 with SMTP id h21csp843185jao; Mon, 31 May 2021 06:44:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSWWmWLHGZN8UjiXRSElXb/QxOU2wCC5pHVTCx473eOe6F/hDUUnXXACLHt2hbNYBZNNWT X-Received: by 2002:a05:6e02:1d18:: with SMTP id i24mr17591654ila.157.1622468668621; Mon, 31 May 2021 06:44:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622468668; cv=none; d=google.com; s=arc-20160816; b=OJoknRoZkpgB1LDQLKBLeNzXe5PRegC7P2Wsi4/Lk4RwtU2OK38YL2LNaAtvI0J3U/ jXA4+0IDnzFY2vTOag3PXYWQlMk4ZGI4HpoG1hzWkbVXx2MSmgesxiTDv+rtItyY6lJ/ /ScvGgG2uC/2rD59XsXB9mk5xfCD0DTnShgIOFV3t9ebZYghwDkz0XRWTxNc2U8o803K KPTNFkySwW+Ai6zbUPQidmk3znDtqhHYJaWdpkVwucKxGXW1nvZ6ug6oHNPIjL6/j80R n44KqKP5PhLRcTh9HwKk/XWfCPHG8drTl2sGIDTq2afPv1yq4CZGRA7f2SS02N72Lm78 l+/Q== 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=M6gxSg4/idwDDaiXHfJpO9PomDcAGfSvwTOTp/OSJGI=; b=MBHzJjtV0rvnL+eWnZMTHfxRIH+/5TbEUUty52uzVmWAo3HrcjgcbKK7hBBpnx6tnz ZHY6BAwi1Zy0mONyZOusiC2oiVIN1vH75rUrRxG7i14hgJyGpraSVxamluWMe/Dl5Hh4 AObndIhnUX+JMcy0nUy0cUCjPTHL3rec64eauAyuHj4yl3Syk5K4YWHHtqCMq54M8HDM TTu2vNKoUQsANeuR8OG8NY/nEA+9FJAivLXiR6Qxnni2hO7YJXYlQNQXZ5qMAUaaNpqi F1b+rNPksTRVL7PoYE7Wo4AcQg3wmmOJ6X3GpA+QEuOPinUAF9qdOWh+W7TXO9X6KNdG 65kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=m4RYgh8F; 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 i13si16272293ilm.156.2021.05.31.06.44.28; Mon, 31 May 2021 06:44:28 -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=m4RYgh8F; 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 S231994AbhEaNqD (ORCPT + 12 others); Mon, 31 May 2021 09:46:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:48556 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232650AbhEaNn6 (ORCPT ); Mon, 31 May 2021 09:43:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9804E6141B; Mon, 31 May 2021 13:29:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622467753; bh=/VB0cNKBXrkiO0qO9uaMW7ltrXMVcezAhAeh1le109A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m4RYgh8FAI/9KvGG8QR9dimYfEFE+MzkOFxYcQUXG1zU0zWnvpybs32XuuHSqFW2c E8KQoFv6n/CI/wMv4xOiWS7c5nVIYQrGQVDokTvjAIRtLe1+f/2heWfvn6agp7FrLa AWQhRx2Hu+KAyN/Fiz/wIAWnm7RGyYEtXWD+9Ek4= 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 4.14 66/79] net: bnx2: Fix error return code in bnx2_init_board() Date: Mon, 31 May 2021 15:14:51 +0200 Message-Id: <20210531130638.104305270@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130636.002722319@linuxfoundation.org> References: <20210531130636.002722319@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 e3af1f3cb61f..299cefe6f94b 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -8252,9 +8252,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; }