From 764b5dcc4922f6e5edbc4ac6e1a6b784c9945d96 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Wed, 4 Jan 2012 20:23:34 +0000 Subject: [PATCH] --- yaml --- r: 279482 b: refs/heads/master c: 1c26750c485de20a3bd68ec5d396887650b53976 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000/e1000_main.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 53f3d6199998..7801ac1afa1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a3847e007aae732d64d8fd1374126393e9879a3 +refs/heads/master: 1c26750c485de20a3bd68ec5d396887650b53976 diff --git a/trunk/drivers/net/ethernet/intel/e1000/e1000_main.c b/trunk/drivers/net/ethernet/intel/e1000/e1000_main.c index 934d5aaee22f..9cf07f6322f8 100644 --- a/trunk/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/trunk/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);