---

yaml --- r: 66853 b: refs/heads/master c: 6daf653 h: refs/heads/master i: 66851: ea98da4 v: v3
git-mirror · Oct 10, 2007 · 32de3b0 · 32de3b0
1 parent e1995a0
commit 32de3b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);