From patchwork Mon May 31 13:14:30 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: 450492 Delivered-To: patch@linaro.org Received: by 2002:a02:c735:0:0:0:0:0 with SMTP id h21csp827879jao; Mon, 31 May 2021 06:25:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzyT2qWG9B/i9fQOHx5PuSHRzeZl/W/3zTrL5p42xSo2GR99wX93C5b8uauYqIGwv4KqOj X-Received: by 2002:a92:c564:: with SMTP id b4mr17454341ilj.257.1622467536174; Mon, 31 May 2021 06:25:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622467536; cv=none; d=google.com; s=arc-20160816; b=C4eAwU4BbXMM7IEYSc5bW1Jsi0CpqhmHcg1Q6rK3Kvzv++rhPnDcKUX3IkuDMjwTFv CuFa2uBdlb3A6VOak7oCLFs7ziR/91UTMbO9VebokfWOMFDjCScyb2QCLZkEG0pl21KA /av8NaAmvJCtuRPwSK0sZDeogm/P82DE9JlV8s/Vd/X2VVOeDPZstjbp61akoIjP7AyS OU5sK2lRMwbeKAS/PI+NYgs+60S0mRJKI1jxGrahNbYdvQfKL6BZ1Zejj3VzSDeaZtU1 JaSaj0MZiXyo1x5QC+deBoiVsDZ1gqAotCxOTFpOIN/Hw9l3v/dgAaxhcfybj/gU+xbq k7sA== 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=tGBihlmUPHPbsJwNcSjSEqjG7MPKFDDu16SRSjZQuNU=; b=p794gGwKVLqW5cHDMC30tF8Ac07NHFkeuLEPljcJH7V0MLX356uzWLIXMWikzZcsfi gTQDL7jaKz7v11fQ+Z85Vbb4jZ4lQLTE+E9GEJ4UChZKr4H/TV5IDDV2ZXF20ZU92uDU /5eGB7Xc9O5hZkwpB40DnyZO+N48yAmK8OGhhrtnRpX++LIeE6t0NsgxwuN8B9vOFWd5 AvreVYel9y1aqzLoB26qvUbGSmOcVModMogRVjedYRYkKAqnbX2gEXq6hCnbigH5XPmI hyv3GKjJHrRlN+OIMBg1f2x4SwpZd2dID+YZWf75bcUPC4nYMf1aN8SwxhB8TZCiHIP3 lm4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WPA17Mcg; 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 k17si14184595ion.39.2021.05.31.06.25.35; Mon, 31 May 2021 06:25:36 -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=WPA17Mcg; 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 S231919AbhEaN1K (ORCPT + 12 others); Mon, 31 May 2021 09:27:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:32882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232245AbhEaNZE (ORCPT ); Mon, 31 May 2021 09:25:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DFD8961401; Mon, 31 May 2021 13:20:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622467236; bh=cA5NOrNWalJKhg9rRHxMvNtggRGkZS+yg8g6K10CDm0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WPA17McghC4QltfzK54sStgg3VforZHTdLYq1HIxJoiuD0KDJ5arjFCQ1bJWq/Zui fHwP3AuVpLsMpAikm5YVEzgLGvz4kPgTi7WFNdmz/ndN/I8Tdvn6Tj7KnZZ+20Ui7k xt3HlDmmXR0YI1HJGv9I5qMhMcUSgBp9yruMzrXs= 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.9 57/66] net: bnx2: Fix error return code in bnx2_init_board() Date: Mon, 31 May 2021 15:14:30 +0200 Message-Id: <20210531130638.055138517@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130636.254683895@linuxfoundation.org> References: <20210531130636.254683895@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 1f7034d739b0..e15e487c14dd 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -8256,9 +8256,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; }