Commit bd709574 authored by Pavel Machek's avatar Pavel Machek Committed by David S. Miller
Browse files

net: pxa168_eth: Fix a potential data race in pxa168_eth_remove 



Commit 0571a753 cancelled delayed work too late, keeping small
race. Cancel work sooner to close it completely.

Signed-off-by: default avatarPavel Machek (CIP) <pavel@denx.de>
Fixes: 0571a753 ("net: pxa168_eth: Fix a potential data race in pxa168_eth_remove")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 96a19319

drivers/net/ethernet/marvell/pxa168_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -1528,6 +1528,7 @@ static int pxa168_eth_remove(struct platform_device *pdev) 
	struct net_device *dev = platform_get_drvdata(pdev);

	struct pxa168_eth_private *pep = netdev_priv(dev);



	cancel_work_sync(&pep->tx_timeout_task);

	if (pep->htpr) {

		dma_free_coherent(pep->dev->dev.parent, HASH_ADDR_TABLE_SIZE,

				  pep->htpr, pep->htpr_dma);
@@ -1539,7 +1540,6 @@ static int pxa168_eth_remove(struct platform_device *pdev) 
	clk_disable_unprepare(pep->clk);

	mdiobus_unregister(pep->smi_bus);

	mdiobus_free(pep->smi_bus);

	cancel_work_sync(&pep->tx_timeout_task);

	unregister_netdev(dev);

	free_netdev(dev);

	return 0;