---

yaml --- r: 369593 b: refs/heads/master c: 65e8d5b h: refs/heads/master i: 369591: 5eae1a0 v: v3
git-mirror · Apr 22, 2013 · 41e5bad · 41e5bad
1 parent 8d79024
commit 41e5bad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a42c74ee608a424342ef7069ccddf196d873040c
+refs/heads/master: 65e8d5b8cbff766628dad7d366986676f18b1e89
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
@@ -8159,9 +8159,11 @@ static int nl80211_stop_p2p_device(struct sk_buff *skb, struct genl_info *info)
 	if (!rdev->ops->stop_p2p_device)
 		return -EOPNOTSUPP;
 
+	mutex_lock(&rdev->devlist_mtx);
 	mutex_lock(&rdev->sched_scan_mtx);
 	cfg80211_stop_p2p_device(rdev, wdev);
 	mutex_unlock(&rdev->sched_scan_mtx);
+	mutex_unlock(&rdev->devlist_mtx);
 
 	return 0;
 }