Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fda4d85d authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnx2: Fix accidental reversions. 



Commit 4ce45e02
"bnx2: Add BNX2 prefix to CHIP ID and name macros"

accidentally reverted 2 commits to use pci_ioumap() and to make
pci_error_handlers const.  This fixes those mistakes.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d4bca3d7

drivers/net/ethernet/broadcom/bnx2.c

+2 −2
Original line number Diff line number Diff line
@@ -8572,7 +8572,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	return 0;



error:

	iounmap(bp->regview);

	pci_iounmap(pdev, bp->regview);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);
@@ -8750,7 +8750,7 @@ static void bnx2_io_resume(struct pci_dev *pdev) 
	rtnl_unlock();

}



static struct pci_error_handlers bnx2_err_handler = {

static const struct pci_error_handlers bnx2_err_handler = {

	.error_detected	= bnx2_io_error_detected,

	.slot_reset	= bnx2_io_slot_reset,

	.resume		= bnx2_io_resume,