openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bnx2: Fix accidental reversions. 

Commit 4ce45e0246
"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: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2012-12-11 18:24:20 -08:00 committed by David S. Miller
parent d4bca3d7fe
commit fda4d85d61
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/broadcom/bnx2.c
View File

@ -8572,7 +8572,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
return 0; return 0;
error: error:
iounmap(bp->regview); pci_iounmap(pdev, bp->regview);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
@ -8750,7 +8750,7 @@ static void bnx2_io_resume(struct pci_dev *pdev)
rtnl_unlock(); 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, .error_detected = bnx2_io_error_detected,
.slot_reset = bnx2_io_slot_reset, .slot_reset = bnx2_io_slot_reset,
.resume = bnx2_io_resume, .resume = bnx2_io_resume,