summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-03 13:39:16 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-03 13:39:16 -0400
commit5c55c434917429f229a1bf43def97fd421f444c6 (patch)
treead299c2f5c63a560ce6c37b913bb60a791d5c1a3 /net
parentf778089cb2445dfc6dfd30a7a567925fd8589f1e (diff)
parentee0a8169b693e1c708d0f9af0a5e4ade65a65439 (diff)
downloadlinux-5c55c434917429f229a1bf43def97fd421f444c6.tar.bz2
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'net')
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_wx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c
index 442b9875f3fb..5742dc803b79 100644
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
@@ -114,7 +114,7 @@ check_assoc_again:
sm->associnfo.associating = 1;
/* queue lower level code to do work (if necessary) */
schedule_delayed_work(&sm->associnfo.work, 0);
-out:
+
mutex_unlock(&sm->associnfo.mutex);
return 0;