]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
net: stmmac: Fix possible deadlock when disabling EEE support
authorJon Hunter <jonathanh@nvidia.com>
Wed, 26 Jun 2019 10:23:21 +0000 (11:23 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Jun 2019 16:10:24 +0000 (09:10 -0700)
commit0867bb9768dedaae2c0e572ade5ccaa682a9298c
tree11a38f45454d789acd81003ba4dd1c2b81620aa3
parent3b525691529b01cbea03ce07e5df487da5e44a31
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: 74371272f97f ("net: stmmac: Convert to phylink and remove phylib logic")
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c