diff --git a/[refs] b/[refs] index 0725ef3e9e5e..10376d002a25 100644 --- 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 index 212d2aa7a1c5..3abcbbada6d4 100644 --- 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; }