From 32de3b0f00a60456a19b7294b215127513075489 Mon Sep 17 00:00:00 2001
From: "Maciej W. Rozycki" <macro@linux-mips.org>
Date: Fri, 28 Sep 2007 22:42:15 -0700
Subject: [PATCH] --- yaml --- r: 66853 b: refs/heads/master c:
 6daf65310374d24d888201b7a6eba90b44008b7b h: refs/heads/master i:   66851:
 ea98da42887ff57392072d2e64f16a539c8bf011 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/phy/phy.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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);