Commit e8b56dfb authored May 15, 2021 by Zhen Lei Committed by Greg Kroah-Hartman Jun 03, 2021

net: bnx2: Fix error return code in bnx2_init_board()



[ Upstream commit 28c66b6da4087b8cfe81c2ec0a46eb6116dafda9 ]

Fix to return -EPERM from the error handling case instead of 0, as done
elsewhere in this function.

Fixes: b6016b76 ("[BNX2]: New Broadcom gigabit network driver.")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 8d23e166

drivers/net/ethernet/broadcom/bnx2.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8253,9 +8253,9 @@ bnx2_init_board(struct pci_dev pdev, struct net_device dev)
	BNX2_WR(bp, PCI_COMMAND, reg);		BNX2_WR(bp, PCI_COMMAND, reg);
	} else if ((BNX2_CHIP_ID(bp) == BNX2_CHIP_ID_5706_A1) &&		} else if ((BNX2_CHIP_ID(bp) == BNX2_CHIP_ID_5706_A1) &&
	!(bp->flags & BNX2_FLAG_PCIX)) {		!(bp->flags & BNX2_FLAG_PCIX)) {

	dev_err(&pdev->dev,		dev_err(&pdev->dev,
	"5706 A1 can only be used in a PCIX bus, aborting\n");		"5706 A1 can only be used in a PCIX bus, aborting\n");
			rc = -EPERM;
	goto err_out_unmap;		goto err_out_unmap;
	}		}