---

yaml --- r: 278883 b: refs/heads/master c: fb03c5e h: refs/heads/master i: 278881: f94c4dd 278879: 2fb99a0 v: v3
git-mirror · Dec 13, 2011 · 0fb7f84 · 0fb7f84
1 parent d1cffee
commit 0fb7f84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc78d6b16a6853a3f6c014a6173df41d80f65a35
+refs/heads/master: fb03c5eb8c0bbf4561cb5aa72e0a9546e9574661
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
@@ -993,8 +993,10 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
 	if (params->channel_fixed) {
 		sdata->local->oper_channel = params->channel;
 		if (!ieee80211_set_channel_type(sdata->local, sdata,
-					       params->channel_type))
+					       params->channel_type)) {
+			mutex_unlock(&sdata->u.ibss.mtx);
 			return -EINVAL;
+		}
 	}
 
 	if (params->ie) {