Merge tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[~andy/linux] / drivers / net / ethernet / marvell / mv643xx_eth.c

diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index b3d9327f78b9124cdd297fdbdb8d02bacbbbe335..a2565ce22b7c9af32d6c34ac011f468e36153296 100644 (file)
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2080,6 +2080,7 @@ static void port_start(struct mv643xx_eth_private *mp)
                mv643xx_eth_get_settings(mp->dev, &cmd);
                phy_init_hw(mp->phy);
                mv643xx_eth_set_settings(mp->dev, &cmd);
+               phy_start(mp->phy);
        }
 
        /*
@@ -2275,7 +2276,8 @@ static int mv643xx_eth_stop(struct net_device *dev)
        del_timer_sync(&mp->rx_oom);
 
        netif_carrier_off(dev);
-
+       if (mp->phy)
+               phy_stop(mp->phy);
        free_irq(dev->irq, dev);
 
        port_reset(mp);