From patchwork Mon May 31 13:14:36 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: 450502 Delivered-To: patch@linaro.org Received: by 2002:a02:c735:0:0:0:0:0 with SMTP id h21csp862452jao; Mon, 31 May 2021 07:08:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywtJvDvPXd3tTs02CjTFOGtAX3OXBX5PEwnjXyjyB79DRXe9u3jlzJBv1nXzAYaA1notpj X-Received: by 2002:a17:906:5f93:: with SMTP id a19mr14926889eju.18.1622470090765; Mon, 31 May 2021 07:08:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622470090; cv=none; d=google.com; s=arc-20160816; b=gkokIXtyji+SO7yBTawA0rMyKCmVis6j7KxUkOMWrsxR/AHSD22RQZ3Q89b8oSoORv j+UMVNWa1L/DXlnlT7ljVKVfDowWBbJ4Yc6A553ZmbVhwJyHEpgJauzdI5qBINmbqsHe fhFNrwLSrih7h3EGVpBvX6cPJfH8PeV3TBURbJb2rPOyadK2hN8ELcDbk8aKCGYkBCf7 6jYMIPgDXDHE4SagjFrW28w97hU5hNObsOlXppe+wB12R2iFnmt8k3xPbyEm1O9iDS/8 70Zt58uHVoeDrFRksj1SMtkZfD16EMmCYt0OuggkGb6qbf8XYRv45y0MggoPlMlI74mf 6QUA== 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=colnv0A82nz9p+dq3QcYJ9XSFgO/WUlNjXjLJbJd++M2GxaHu9L+m2Q9Eh0Qs2wake gyByQzWHWXPQ/j1C/QyWvf9bxipA+iVESfW80pLceTnuemj+yH7tVkZfuDpxK2tspJ+4 BfnUXkBmN1TbeEF96oGO1CsgmHjG2rTfiaJzWtJyhWc5/Uvd+gbHE+I+ojDs407p+txR BKuEgzLjTuKTK7wpig//jNTgVcQn38wrvyDe3qbDnoanROp4zTyCeVEnpKVVRxQCJkUc /o4yKNnQsG1lOuWzz9rh/SEd/CBgEveE21LgjJeDItcLfLRFY/W0vpETgsGE/6LLE7DM HqWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ri61Rxph; 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 l21si8342395eja.295.2021.05.31.07.08.10; Mon, 31 May 2021 07:08:10 -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=ri61Rxph; 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 S230375AbhEaOJs (ORCPT + 12 others); Mon, 31 May 2021 10:09:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:40090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233101AbhEaOHD (ORCPT ); Mon, 31 May 2021 10:07:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 48951613AD; Mon, 31 May 2021 13:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622468353; bh=DQknK+guMV8EB2YI3n8n9bEN8CPrQG+Hf0znxpFfcVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ri61RxphaYGF1yNHZ/VD0Y5WH+SrpgDGvI69qVDVIiDVvF+DWsJJkf9lBZ0GNWTTN qpQYbZnShaSAU/pKD20ThbhrpZXvLPLoYFlCDQ4XfXU5fJJ9B8meL4Tv0GJppNG5t+ TJuUj96pmbIGe05S73CS985zcMGCI0skKlQJflXg= 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.10 211/252] net: bnx2: Fix error return code in bnx2_init_board() Date: Mon, 31 May 2021 15:14:36 +0200 Message-Id: <20210531130705.188298167@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130657.971257589@linuxfoundation.org> References: <20210531130657.971257589@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; }