From: Florian Fainelli <ffainelli@freebox.fr>
To: jeffrey.t.kirsher@intel.com
Cc: e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org,
Florian Fainelli <ffainelli@freebox.fr>
Subject: [PATCH 1/2] e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove
Date: Wed, 7 Dec 2011 17:41:01 +0100 [thread overview]
Message-ID: <1323276062-10906-1-git-send-email-ffainelli@freebox.fr> (raw)
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>
---
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 82f4ef1..7bb3337 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.5.4
next reply other threads:[~2011-12-07 16:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-07 16:41 Florian Fainelli [this message]
2011-12-07 16:41 ` [PATCH 2/2] e1000: cleanup CE4100 MDIO registers access Florian Fainelli
2011-12-07 22:01 ` [PATCH 1/2] e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove Jeff Kirsher
2012-01-04 19:01 ` Florian Fainelli
2012-01-04 21:41 ` Jeff Kirsher
2012-01-06 14:21 ` Florian Fainelli
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=1323276062-10906-1-git-send-email-ffainelli@freebox.fr \
--to=ffainelli@freebox.fr \
--cc=e1000-devel@lists.sourceforge.net \
--cc=jeffrey.t.kirsher@intel.com \
--cc=netdev@vger.kernel.org \
/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).