Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0867bb97 authored by Jon Hunter's avatar Jon Hunter Committed by David S. Miller
Browse files

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: default avatarJon Hunter <jonathanh@nvidia.com>
Tested-by: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b525691

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ bool stmmac_eee_init(struct stmmac_priv *priv) 
		netdev_dbg(priv->dev, "disable EEE\n");

		del_timer_sync(&priv->eee_ctrl_timer);

		stmmac_set_eee_timer(priv, priv->hw, 0, tx_lpi_timer);

		mutex_unlock(&priv->lock);

		return false;

	}