commit 856db9204b8d5a940c2b0cb0767db2c9df925c3e
author Linux Build Service Account <lnxbuild@quicinc.com> Thu Sep 28 00:34:55 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 28 00:34:55 2017 -0700
tree 0819432dc3ff44ee0e1a2ecccc5ebda711f5d6b2
parent 52e2ee623f2fa7b45542e444dd7c398f16a2e133
parent f54b6540b39789981dbc3122fc97422602e9512b

Merge "wil6210: add proper locking in cfg suspend"

drivers/net/wireless/ath/wil6210/cfg80211.c

diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 9552d2a..e2a459e 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -1802,9 +1802,13 @@
 
 	wil_dbg_pm(wil, "suspending\n");
 
+	mutex_lock(&wil->mutex);
 	wil_p2p_stop_discovery(wil);
 
+	mutex_lock(&wil->p2p_wdev_mutex);
 	wil_abort_scan(wil, true);
+	mutex_unlock(&wil->p2p_wdev_mutex);
+	mutex_unlock(&wil->mutex);
 
 out:
 	return rc;