From patchwork Mon May 31 13:15:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 450508 Delivered-To: patch@linaro.org Received: by 2002:a02:c735:0:0:0:0:0 with SMTP id h21csp879707jao; Mon, 31 May 2021 07:29:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoWwvNELfk6IVThFp31tqFPjIk5LbJeUpsibALb6VAbUDBdbnN5oDfibaKYI3RwNUs/Zqs X-Received: by 2002:a05:6402:343:: with SMTP id r3mr4340660edw.22.1622471370840; Mon, 31 May 2021 07:29:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622471370; cv=none; d=google.com; s=arc-20160816; b=yKeGRXPtqUHEEo0T4iLH1EttV5GHtomFIfGEKhvPoSoDOdjEsp8PLRvcTLRL3504Vx OdwxuzBM4upDOpAoB2QMflgtfqtc3ikhf6iO85LbrwOKKmpXpVCGqKn4huzfKT/Ds2o6 ir+i/NdNhDguKOmA5muBIKAgha8YXZNAaEuhQ4I+5TMhTdxhGT03ekgLXUTpHagQvTOZ h3nStcauUxg/ynPL/QLabtQ8IqxjXWS3W2KvQIn4r6gd6thJp5vUE9g8gFqnfaGA/dzY 6v7Y7Smw7W/mCKiTcPHyLz67WVjHpdFUg3UEiU92lsKeoMy79OQqo8tcf3pM7GAVsvP1 mtaw== 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=rcQwYT01fjxJCu9M+jgku7AwtbmCkILb9irj2CJacfA=; b=LErZa1e6SsLxov4kDrah2K+i881W+4RSpvHtkFPInzQccDsWHoVSCYxH2sUnV8t+VT 4okvND4MUxjQnqIqnIXQ0o8dGbeKRVQeSijdaaX4GESL8jtXD73O9yDk8IhMY0IdzzRw TZxutTbv/XlOy5QsDL+ktquViU6LSGUXGA4LUOfHUgl+/yKCh//NANc3cMehYvPrwveG iMmGxe4KZrIBZp1rfKgScwh7QEXT9VlrLx+6oBnzT1Bbv9aHbV9kHBLl2rzn3utTaZpN 3Am5DN7LInt08aaevvrj7P/qS8IFPAr5rV+yI3I+PkgX2DP5a4vXzAvPG/f6Wy77poW6 OVGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JP3aN30D; 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 c14si13642114edr.309.2021.05.31.07.29.30; Mon, 31 May 2021 07:29:30 -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=JP3aN30D; 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 S232414AbhEaObE (ORCPT + 12 others); Mon, 31 May 2021 10:31:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:56028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233152AbhEaO1U (ORCPT ); Mon, 31 May 2021 10:27:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 15A2D61C1E; Mon, 31 May 2021 13:47:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622468842; bh=9K4knyuZRMVs006sgoDZrkFeKyJ2moadM/OTsLB6EtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JP3aN30DoQbbutnXOhUQZB5KrtvBEhGliNRbD4B7oe3UlJIhNdXFUB/Gljb5YAnD/ Umj8V1Igof0JsYBLrlmlupLRVl5POG4NYIB8PBzjzGf1ufS5FuGJxJyQzOyZ612LGe 8BMcz/nSjl5eMy2x21r48S8PKkI4B+rXqt+o561Y= 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.4 149/177] net: bnx2: Fix error return code in bnx2_init_board() Date: Mon, 31 May 2021 15:15:06 +0200 Message-Id: <20210531130653.080249605@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130647.887605866@linuxfoundation.org> References: <20210531130647.887605866@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 fbc196b480b6..c3f67d8e1093 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -8249,9 +8249,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; }