From patchwork Mon May 31 13:14:11 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: 450491 Delivered-To: patch@linaro.org Received: by 2002:a02:c735:0:0:0:0:0 with SMTP id h21csp822480jao; Mon, 31 May 2021 06:19:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwD7OmllkCQ2o8ZCpU7yzV/JEKc1iG69oN6vMq4bVG+Z14dDioca7YWUXOOnCgfM7gadEqt X-Received: by 2002:a5d:8481:: with SMTP id t1mr17484190iom.39.1622467170469; Mon, 31 May 2021 06:19:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622467170; cv=none; d=google.com; s=arc-20160816; b=y0JsApyKbZwOp5ylLJPcPUv+KpJ1W2/EjuLONc1K+w7K7qY0HbJYmIVYQ6i8d1qzOY 1P7WuSwH0InCJgxdz+TBdUrH3pBYBTHlS371Ureh5BXtzjlcGWYsPIcL6rNWlnby7ZBv BypQ+Orig63EsubGAmrlcJZ81XERObf9+4NNop3nt54T49aAsPBflpNXOM/SBeq45txK Nm5J5YCccQ1SeuTrknbPkL+Ac1goW/OpdCdSGeu8wcne71zm1YKw9y15IIWGALuQvBnW Kd1YdvsEu2E6lhXlJcD/h19GmUSdBvaHx5l4XmLzNE9dMdvcFQmnUvO0lJK6elvz+5o7 XTIg== 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=Gz5C6CO3cBgKOZftsyb+bRRy/rARW8rvDiy4mAiWxRs=; b=aGvxBmby5jvyRpRCaQzWRQWaErGkqkmhiXAbbboZvDJBK5kSoJg7tmYAl3YDz7AI/j QTfxkdcyXtLstZfclcEBEjtfItzF12eH/+6z2gMOvqPsKQWAUt5gQWrBpOLQZlGoESPo FK/+Dui91/5odNL9MUfETV8QFy1KFdBnzvIXJng0+hOfu7T1bpduWUljYgHsOZeIsYji v7RD1xQhewJWG3MSOeFr9rVvRudQaRUlQYB+WYNebM1G7y+2Jje9lIjcjT1xDxxcqq2o 9ooYQcSSZgq8ZD4b+USNmkxN2oELZ7Wd5PZfwVgOj89f7uYhtfIpqFkHwGVFHvVIthK9 3BLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TVPkMMVC; 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 b26si14012806ios.29.2021.05.31.06.19.30; Mon, 31 May 2021 06:19: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=TVPkMMVC; 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 S231712AbhEaNVC (ORCPT + 12 others); Mon, 31 May 2021 09:21:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:55746 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232064AbhEaNTo (ORCPT ); Mon, 31 May 2021 09:19:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 36F3161377; Mon, 31 May 2021 13:18:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622467083; bh=FMNDbHJyR1yFhBZFdBkbQHuDm1VO8zhRtpuMLJBB2Jw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TVPkMMVC+wmF810aZr2bmryvqXByTl07QtA3pzg7ig++EM3vXrLmeRwMxd8NfKm1h uZbSWKAc/Kc7q0vDZlz03drWHRUlJci7x2AeMmIW2QklACJof+2zv3lZj0xn/SK1SW UHSgYC7+B6/ydhD/jZVg3srIs8vMzbyYceeHW2rc= 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.4 45/54] net: bnx2: Fix error return code in bnx2_init_board() Date: Mon, 31 May 2021 15:14:11 +0200 Message-Id: <20210531130636.484118158@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130635.070310929@linuxfoundation.org> References: <20210531130635.070310929@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 8fc3f3c137f8..1616647719ba 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -8234,9 +8234,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; }