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

Commit cec753f5 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by David S. Miller
Browse files

net: mv643xx_eth: use phy_disconnect instead of phy_detach 



Using a separated mdio bus driver with mvmdio, phy_detach on network device
removal will not stop the phy and finally lead to NULL pointer dereference
in mvmdio due to non-existent network device. Use phy_disconnect instead
to properly stop phy device from accessing network device prior removal of
the network device.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e7c4143

drivers/net/ethernet/marvell/mv643xx_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -2805,7 +2805,7 @@ static int mv643xx_eth_remove(struct platform_device *pdev) 


	unregister_netdev(mp->dev);

	if (mp->phy != NULL)

		phy_detach(mp->phy);

		phy_disconnect(mp->phy);

	cancel_work_sync(&mp->tx_timeout_task);



	if (!IS_ERR(mp->clk))