From 7f6ae37e1bf5b785d85699c0b90f780e98dc0811 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Sat, 6 Mar 2010 18:35:08 +0200
Subject: [PATCH] --- yaml --- r: 187996 b: refs/heads/master c:
 38a679a52be13d5a0c766597ab823e06688d6e8e h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/net/mac80211/sta_info.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5091ca94ac91..cc8f9d4ff18d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5a9a35cb9c0d92d7c986cb3696fb794be100087
+refs/heads/master: 38a679a52be13d5a0c766597ab823e06688d6e8e
diff --git a/trunk/net/mac80211/sta_info.c b/trunk/net/mac80211/sta_info.c
index 211c475f73c6..56422d894351 100644
--- a/trunk/net/mac80211/sta_info.c
+++ b/trunk/net/mac80211/sta_info.c
@@ -434,6 +434,7 @@ int sta_info_insert_rcu(struct sta_info *sta) __acquires(RCU)
 	/* check if STA exists already */
 	if (sta_info_get_bss(sdata, sta->sta.addr)) {
 		spin_unlock_irqrestore(&local->sta_lock, flags);
+		mutex_unlock(&local->sta_mtx);
 		rcu_read_lock();
 		err = -EEXIST;
 		goto out_free;