]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net: ethernet: mediatek: fix logic unbalance between probe and remove
authorSean Wang <sean.wang@mediatek.com>
Thu, 1 Sep 2016 02:47:31 +0000 (10:47 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 1 Sep 2016 03:53:47 +0000 (20:53 -0700)
original mdio_cleanup is not in the symmetric place against where
mdio_init is, so relocate mdio_cleanup to the right one.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Acked-by: John Crispin <john@phrozen.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mediatek/mtk_eth_soc.c

index 1ffde919174dcf9ddeb97ec3dc166d840551a63e..bf5b7e1d945083dbc51c72ae3324e92da7ea9245 100644 (file)
@@ -1511,7 +1511,6 @@ static void mtk_uninit(struct net_device *dev)
        struct mtk_eth *eth = mac->hw;
 
        phy_disconnect(mac->phy_dev);
-       mtk_mdio_cleanup(eth);
        mtk_irq_disable(eth, ~0);
 }
 
@@ -1916,6 +1915,7 @@ static int mtk_remove(struct platform_device *pdev)
        netif_napi_del(&eth->tx_napi);
        netif_napi_del(&eth->rx_napi);
        mtk_cleanup(eth);
+       mtk_mdio_cleanup(eth);
        platform_set_drvdata(pdev, NULL);
 
        return 0;