]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove
authorFlorian Fainelli <ffainelli@freebox.fr>
Wed, 4 Jan 2012 20:23:34 +0000 (20:23 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 03:20:12 +0000 (11:20 +0800)
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 <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>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/e1000/e1000_main.c

index 35e7598247c9152f5b20040713e0a831fcc4b27e..fcc157f8fe2f43e2c44dd86b7dbc307a12bccf2e 100644 (file)
@@ -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);