From ff82bc6161272b4b33357d875981c69ce9309b12 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Tue, 11 Dec 2012 18:24:20 -0800 Subject: [PATCH] --- yaml --- r: 342153 b: refs/heads/master c: fda4d85d6124134dd7c72d6559bd275732eb39b9 h: refs/heads/master i: 342151: 39b8b6bca4684a8d8f0bda75a8b4440f0854ac0b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9bf83f672a46..19bdfe81cf32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4bca3d7fec52e775a3f5a8f9ba2efb354450664 +refs/heads/master: fda4d85d6124134dd7c72d6559bd275732eb39b9 diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2.c b/trunk/drivers/net/ethernet/broadcom/bnx2.c index c16526d3046f..a1adfaf87f49 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2.c +++ b/trunk/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,