---

yaml --- r: 279482 b: refs/heads/master c: 1c26750 h: refs/heads/master v: v3
git-mirror · Jan 5, 2012 · 764b5dc · 764b5dc
1 parent 513519b
commit 764b5dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);