aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/mediatek/mtk_eth_soc.c
diff options
context:
space:
mode:
authorSean Wang <sean.wang@mediatek.com>2016-09-01 10:47:31 +0800
committerDavid S. Miller <davem@davemloft.net>2016-08-31 20:53:47 -0700
commit7c6b0d76fa02213393815e3b6d5e4a415bf3f0e2 (patch)
treef83326918cadb0a42b9f2905e8fa145b44f67101 /drivers/net/ethernet/mediatek/mtk_eth_soc.c
parentnet: ethernet: mediatek: remove redundant free_irq for devm_request_irq allocated irq (diff)
downloadlinux-dev-7c6b0d76fa02213393815e3b6d5e4a415bf3f0e2.tar.xz
linux-dev-7c6b0d76fa02213393815e3b6d5e4a415bf3f0e2.zip
net: ethernet: mediatek: fix logic unbalance between probe and remove
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>
Diffstat (limited to '')
-rw-r--r--drivers/net/ethernet/mediatek/mtk_eth_soc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 1ffde919174d..bf5b7e1d9450 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -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;