2013-10-03 02:50:00 +00:00
|
|
|
From 799e69d38053e344267360a583676eafe2ed8648 Mon Sep 17 00:00:00 2001
|
2013-10-02 00:33:47 +00:00
|
|
|
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
2013-10-03 02:50:00 +00:00
|
|
|
Date: Wed, 29 May 2013 09:32:43 +0000
|
|
|
|
|
Subject: [PATCH 20/29] net: mv643xx_eth: use phy_disconnect instead of
|
2013-10-02 00:33:47 +00:00
|
|
|
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>
|
2013-10-03 02:50:00 +00:00
|
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
2013-10-02 00:33:47 +00:00
|
|
|
---
|
|
|
|
|
drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
|
|
|
|
|
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
|
2013-11-05 08:25:45 +00:00
|
|
|
@@ -2803,7 +2803,7 @@ static int mv643xx_eth_remove(struct pla
|
2013-10-02 00:33:47 +00:00
|
|
|
|
|
|
|
|
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))
|
