diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-05-29 09:32:43 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-30 17:54:03 -0700 |
| commit | cec753f5dd103fcfef28c1d1c942395000abe15e (patch) | |
| tree | 6eb14bcef0f85b6239caa9ae851aa24d2c5cf657 /drivers/net/ethernet/marvell | |
| parent | 9e7c414350a6fa4e5f9b7e5f7e074fa75ba850c3 (diff) | |
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: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index afb8bcbe29f..8124464af83 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -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)) |