aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2011-12-08 09:49:03 +0300
committerJohn W. Linville <linville@tuxdriver.com>2011-12-13 15:30:25 -0500
commitfb03c5eb8c0bbf4561cb5aa72e0a9546e9574661 (patch)
treead6dd8a8329c282b780a1f74ca27f100061aa276
parentcc78d6b16a6853a3f6c014a6173df41d80f65a35 (diff)
downloadkernel_goldelico_gta04-fb03c5eb8c0bbf4561cb5aa72e0a9546e9574661.zip
kernel_goldelico_gta04-fb03c5eb8c0bbf4561cb5aa72e0a9546e9574661.tar.gz
kernel_goldelico_gta04-fb03c5eb8c0bbf4561cb5aa72e0a9546e9574661.tar.bz2
mac80211: unlock on error path in ieee80211_ibss_join()
We recently introduced a new return here but it needs an unlock first. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/ibss.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 3f830ac..0fc9752 100644
--- a/net/mac80211/ibss.c
+++ b/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) {