From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Florian Fainelli <ffainelli@freebox.fr>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 2/8] e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove
Date: Wed, 4 Jan 2012 22:23:34 -0800 [thread overview]
Message-ID: <1325744620-5067-3-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1325744620-5067-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Florian Fainelli <ffainelli@freebox.fr>
We are not unmapping ce4100_gbe_mdio_base_virt in exit path in case
we are running on a CE4100 adapter, fix that.
Signed-off-by: Florian Fainelli <ffainelli@freebox.fr>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/e1000/e1000_main.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 934d5aa..9cf07f6 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -1286,6 +1286,8 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
kfree(adapter->tx_ring);
kfree(adapter->rx_ring);
+ if (hw->mac_type == e1000_ce4100)
+ iounmap(ce4100_gbe_mdio_base_virt);
iounmap(hw->hw_addr);
if (hw->flash_address)
iounmap(hw->flash_address);
--
1.7.7.5
next prev parent reply other threads:[~2012-01-05 6:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-05 6:23 [net-next v2 0/8][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-01-05 6:23 ` [net-next 1/8] e1000: fix lockdep splat in shutdown handler Jeff Kirsher
2012-01-05 6:23 ` Jeff Kirsher [this message]
2012-01-05 6:23 ` [net-next 3/8] e1000: cleanup CE4100 MDIO registers access Jeff Kirsher
2012-01-05 6:23 ` [net-next 4/8] igb: Add support for byte queue limits Jeff Kirsher
2012-01-05 6:23 ` [net-next 5/8] igb: add basic runtime PM support Jeff Kirsher
2012-01-05 6:23 ` [net-next 6/8] igb: reset PHY after recovering from PHY power down Jeff Kirsher
2012-01-05 6:23 ` [net-next v2 7/8] netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call Jeff Kirsher
2012-01-05 6:23 ` [net-next 8/8] ixgbe: FCoE: Add support for " Jeff Kirsher
2012-01-05 18:12 ` [net-next v2 0/8][pull request] Intel Wired LAN Driver Updates David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1325744620-5067-3-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=ffainelli@freebox.fr \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).