Commit 102463b1 authored by Francesco Virlinzi's avatar Francesco Virlinzi Committed by David S. Miller

stmmac: fix pm functions avoiding sleep on spinlock

This patch fixes the pm functions to avoid the system
sleeps while a spinlock is taken.
Signed-off-by: default avatarFrancesco Virlinzi <francesco.virlinzi@st.com>
Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 989508ba
...@@ -2011,12 +2011,13 @@ static int stmmac_suspend(struct device *dev) ...@@ -2011,12 +2011,13 @@ static int stmmac_suspend(struct device *dev)
if (!ndev || !netif_running(ndev)) if (!ndev || !netif_running(ndev))
return 0; return 0;
if (priv->phydev)
phy_stop(priv->phydev);
spin_lock(&priv->lock); spin_lock(&priv->lock);
netif_device_detach(ndev); netif_device_detach(ndev);
netif_stop_queue(ndev); netif_stop_queue(ndev);
if (priv->phydev)
phy_stop(priv->phydev);
#ifdef CONFIG_STMMAC_TIMER #ifdef CONFIG_STMMAC_TIMER
priv->tm->timer_stop(); priv->tm->timer_stop();
...@@ -2074,12 +2075,13 @@ static int stmmac_resume(struct device *dev) ...@@ -2074,12 +2075,13 @@ static int stmmac_resume(struct device *dev)
#endif #endif
napi_enable(&priv->napi); napi_enable(&priv->napi);
if (priv->phydev)
phy_start(priv->phydev);
netif_start_queue(ndev); netif_start_queue(ndev);
spin_unlock(&priv->lock); spin_unlock(&priv->lock);
if (priv->phydev)
phy_start(priv->phydev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment