From: Florian Fainelli Date: Wed, 4 Jan 2012 20:23:34 +0000 (+0000) Subject: e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~394 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ede8ee3446cb72bfd889494ddf5c77bcf244432c;p=users%2Fjedix%2Flinux-maple.git e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove We are not unmapping ce4100_gbe_mdio_base_virt in exit path in case we are running on a CE4100 adapter, fix that. (cherry picked from commit 1c26750c485de20a3bd68ec5d396887650b53976) Signed-off-by: Florian Fainelli Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 35e7598247c91..fcc157f8fe2f4 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -1281,6 +1281,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);