| Submitter | Michael Chan |
|---|---|
| Date | Dec. 12, 2012, 2:24 a.m. |
| Message ID | <1355279060-24192-1-git-send-email-mchan@broadcom.com> |
| Download | mbox | patch |
| Permalink | /patch/205350/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
From: "Michael Chan" <mchan@broadcom.com> Date: Tue, 11 Dec 2012 18:24:20 -0800 > 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index c16526d..a1adfaf 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,
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> --- drivers/net/ethernet/broadcom/bnx2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)