aboutsummaryrefslogtreecommitdiff
path: root/net/ieee80211/softmac/ieee80211softmac_wx.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-12-26 16:38:31 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-26 16:38:31 -0500
commit3a960f7e350de5d087b88a4c06df236e0f4186fd (patch)
tree14e5a1b941d6e4cf7b2c9c1ed46262f427a825a9 /net/ieee80211/softmac/ieee80211softmac_wx.c
parentaed2cec45c426c941c80d84ec89ce34f2f2607cc (diff)
parent0c234ae655a45ac3ee53a25b2e56e9bb6c27d71d (diff)
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_wx.c')
-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 480d72c7a42..fa2f7da606a 100644
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
@@ -463,7 +463,7 @@ ieee80211softmac_wx_get_genie(struct net_device *dev,
err = -E2BIG;
}
spin_unlock_irqrestore(&mac->lock, flags);
- mutex_lock(&mac->associnfo.mutex);
+ mutex_unlock(&mac->associnfo.mutex);
return err;
}