[PATCH v2 04/12] wil6210: abort properly in cfg suspend
flat view
STALE3279d
SUPERSEDED
From: Maya Erez <hidden>
Date: 2017-11-01 19:23:34
Subsystem:
atheros ath generic utilities, the rest, wilocity wil6210 wireless driver · Maintainers:
Jeff Johnson, Linus Torvalds
Revision v2 of 3 in this series.
Revisions (3)
- v1 [diff vs current]
- v2 current
- v3 [diff vs current]
From: Hamad Kadmany <redacted> On-going operations were not aborted properly and required locks were not taken. Signed-off-by: Hamad Kadmany <redacted> Signed-off-by: Maya Erez <redacted> --- drivers/net/wireless/ath/wil6210/cfg80211.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 85d5c04..c3d3c0c 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c@@ -1727,9 +1727,12 @@ static int wil_cfg80211_suspend(struct wiphy *wiphy, wil_dbg_pm(wil, "suspending\n"); - wil_p2p_stop_discovery(wil); - + mutex_lock(&wil->mutex); + mutex_lock(&wil->p2p_wdev_mutex); + wil_p2p_stop_radio_operations(wil); wil_abort_scan(wil, true); + mutex_unlock(&wil->p2p_wdev_mutex); + mutex_unlock(&wil->mutex); out: return rc;
--
1.9.1