diff options
| author |   Michael Chan <mchan@broadcom.com> | 2012-12-11 18:24:20 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-12-11 21:28:25 -0500 |
| commit | fda4d85d6124134dd7c72d6559bd275732eb39b9 (patch) | |
| tree | 6c2052991ca7d525cb53a46e3eba04e579711012 /drivers/net/ethernet/broadcom/bnx2.c | |
| parent | bna: Driver Version Updated to 3.1.2.1 (diff) | |
| download | linux-dev-fda4d85d6124134dd7c72d6559bd275732eb39b9.tar.xz linux-dev-fda4d85d6124134dd7c72d6559bd275732eb39b9.zip | |
bnx2: Fix accidental reversions.
Commit 4ce45e02469c382699f4c5f6df727aea9dd2e1ca
"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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index c16526d3046f..a1adfaf87f49 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -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, |