diff --git a/[refs] b/[refs] index 3a70d479c21c..ed2932095581 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ac49527318bc388a881152d60f49d7951606024 +refs/heads/master: 6daf65310374d24d888201b7a6eba90b44008b7b diff --git a/trunk/drivers/net/phy/phy.c b/trunk/drivers/net/phy/phy.c index 5a314edc2744..9bc11773705b 100644 --- a/trunk/drivers/net/phy/phy.c +++ b/trunk/drivers/net/phy/phy.c @@ -737,8 +737,6 @@ void phy_stop(struct phy_device *phydev) if (PHY_HALTED == phydev->state) goto out_unlock; - phydev->state = PHY_HALTED; - if (phydev->irq != PHY_POLL) { /* Disable PHY Interrupts */ phy_config_interrupt(phydev, PHY_INTERRUPT_DISABLED); @@ -747,6 +745,8 @@ void phy_stop(struct phy_device *phydev) phy_clear_interrupt(phydev); } + phydev->state = PHY_HALTED; + out_unlock: spin_unlock_bh(&phydev->lock);