From 4ee7ddefe300c5da120cd9b23519788371a84b7f Mon Sep 17 00:00:00 2001
From: Francesco Virlinzi <francesco.virlinzi@st.com>
Date: Wed, 16 Nov 2011 21:58:02 +0000
Subject: [PATCH] --- yaml --- r: 275735 b: refs/heads/master c:
 102463b18d922dd55c29fbfa222e0355ecf3e42f h: refs/heads/master i:   275733:
 e79694f06264052a580bcad0ba25ea5a105fa2e4   275731:
 e07d784191b321d3d8276d0f0693d54f2dc5eb65   275727:
 344580189534d496814e04c18ca0fa9f69291d41 v: v3

---
 [refs]                                               |  2 +-
 .../net/ethernet/stmicro/stmmac/stmmac_main.c        | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a1fd887a9c06..e26c1b5390b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 989508ba60da6dce79f8aaee1be6c092fd4c67f8
+refs/heads/master: 102463b18d922dd55c29fbfa222e0355ecf3e42f
diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 29dd87c675dc..8ea770a89f25 100644
--- a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2011,12 +2011,13 @@ static int stmmac_suspend(struct device *dev)
 	if (!ndev || !netif_running(ndev))
 		return 0;
 
+	if (priv->phydev)
+		phy_stop(priv->phydev);
+
 	spin_lock(&priv->lock);
 
 	netif_device_detach(ndev);
 	netif_stop_queue(ndev);
-	if (priv->phydev)
-		phy_stop(priv->phydev);
 
 #ifdef CONFIG_STMMAC_TIMER
 	priv->tm->timer_stop();
@@ -2074,12 +2075,13 @@ static int stmmac_resume(struct device *dev)
 #endif
 	napi_enable(&priv->napi);
 
-	if (priv->phydev)
-		phy_start(priv->phydev);
-
 	netif_start_queue(ndev);
 
 	spin_unlock(&priv->lock);
+
+	if (priv->phydev)
+		phy_start(priv->phydev);
+
 	return 0;
 }