diff options
author | Florian Fainelli <ffainelli@freebox.fr> | 2012-01-04 15:23:34 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-05 13:12:03 -0500 |
commit | 1c26750c485de20a3bd68ec5d396887650b53976 (patch) | |
tree | 4650b7770595f339b8d658700e89a4d26c2a6c17 /drivers/net/ethernet/intel/e1000 | |
parent | 3a3847e007aae732d64d8fd1374126393e9879a3 (diff) |
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.
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000')
-rw-r--r-- | 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 934d5aaee22f..9cf07f6322f8 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) | |||
1286 | kfree(adapter->tx_ring); | 1286 | kfree(adapter->tx_ring); |
1287 | kfree(adapter->rx_ring); | 1287 | kfree(adapter->rx_ring); |
1288 | 1288 | ||
1289 | if (hw->mac_type == e1000_ce4100) | ||
1290 | iounmap(ce4100_gbe_mdio_base_virt); | ||
1289 | iounmap(hw->hw_addr); | 1291 | iounmap(hw->hw_addr); |
1290 | if (hw->flash_address) | 1292 | if (hw->flash_address) |
1291 | iounmap(hw->flash_address); | 1293 | iounmap(hw->flash_address); |