From 6d9853a306aa4069004a25ca1c0e65bf1b8ebc68 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 11 Nov 2011 20:22:30 +0100
Subject: [PATCH] --- yaml --- r: 277891 b: refs/heads/master c:
 b4487c2d0edaf1332d7a9f11b5661044955ef5e2 h: refs/heads/master i:   277889:
 4068f823cda50f59a66a7073f6cc584aa1d2effe   277887:
 64ff422a7588ef375fb089be2de1c07a48ede103 v: v3

---
 [refs]                   | 2 +-
 trunk/net/mac80211/cfg.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 710fa78efd87..28a1ab6b44ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 731f8e1c41a4d0ffb589e2395f931f8a1aa6c6a4
+refs/heads/master: b4487c2d0edaf1332d7a9f11b5661044955ef5e2
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index c2416fbd1b27..1063a7e57d62 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -2570,12 +2570,13 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
 
 	rcu_read_lock();
 	sta = sta_info_get(sdata, peer);
-	if (sta)
+	if (sta) {
 		qos = test_sta_flag(sta, WLAN_STA_WME);
-	rcu_read_unlock();
-
-	if (!sta)
+		rcu_read_unlock();
+	} else {
+		rcu_read_unlock();
 		return -ENOLINK;
+	}
 
 	if (qos) {
 		fc = cpu_to_le16(IEEE80211_FTYPE_DATA |