Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e82f7148 authored by Sean Wang's avatar Sean Wang Committed by David S. Miller
Browse files

net: ethernet: mediatek: fix missing changes merged for conflicts overlapping commits 

add the missing commits about
1)
Commit d3bd1ce4
("remove redundant free_irq for devm_request_ir allocated irq")
2)
Commit 7c6b0d76
("fix logic unbalance between probe and remove")

during merge for conflicts overlapping commits by
Commit b20b378d
("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net"

)

Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f9d1846f

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+1 −3
Original line number Diff line number Diff line
@@ -1894,11 +1894,8 @@ 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, MTK_QDMA_INT_MASK, ~0);

	mtk_irq_disable(eth, MTK_PDMA_INT_MASK, ~0);

	free_irq(eth->irq[1], dev);

	free_irq(eth->irq[2], dev);

}



static int mtk_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -2454,6 +2451,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);



	return 0;

}