提交 0867bb97 编写于 作者: J Jon Hunter 提交者: David S. Miller

net: stmmac: Fix possible deadlock when disabling EEE support

When stmmac_eee_init() is called to disable EEE support, then the timer
for EEE support is stopped and we return from the function. Prior to
stopping the timer, a mutex was acquired but in this case it is never
released and so could cause a deadlock. Fix this by releasing the mutex
prior to returning from stmmax_eee_init() when stopping the EEE timer.

Fixes: 74371272 ("net: stmmac: Convert to phylink and remove phylib logic")
Signed-off-by: NJon Hunter <jonathanh@nvidia.com>
Tested-by: NThierry Reding <treding@nvidia.com>
Acked-by: NWillem de Bruijn <willemb@google.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 3b525691
...@@ -402,6 +402,7 @@ bool stmmac_eee_init(struct stmmac_priv *priv) ...@@ -402,6 +402,7 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
netdev_dbg(priv->dev, "disable EEE\n"); netdev_dbg(priv->dev, "disable EEE\n");
del_timer_sync(&priv->eee_ctrl_timer); del_timer_sync(&priv->eee_ctrl_timer);
stmmac_set_eee_timer(priv, priv->hw, 0, tx_lpi_timer); stmmac_set_eee_timer(priv, priv->hw, 0, tx_lpi_timer);
mutex_unlock(&priv->lock);
return false; return false;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册