diff options
| author | Florian Fainelli | 2012-01-04 21:23:34 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-01-05 19:12:03 +0100 |
| commit | 1c26750c485de20a3bd68ec5d396887650b53976 (patch) | |
| tree | 4650b7770595f339b8d658700e89a4d26c2a6c17 /drivers/net/ethernet | |
| parent | e1000: fix lockdep splat in shutdown handler (diff) | |
| download | kernel-qcow2-linux-1c26750c485de20a3bd68ec5d396887650b53976.tar.gz kernel-qcow2-linux-1c26750c485de20a3bd68ec5d396887650b53976.tar.xz kernel-qcow2-linux-1c26750c485de20a3bd68ec5d396887650b53976.zip | |
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')
| -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) 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); |