diff options
author | Ulrich Kunitz <kune@deine-taler.de> | 2006-12-10 12:27:01 -0500 |
---|---|---|
committer | John W. Linville <linville@linville-t43.mobile> | 2006-12-19 16:19:45 -0500 |
commit | 0c234ae655a45ac3ee53a25b2e56e9bb6c27d71d (patch) | |
tree | e8cb6044b4d43b5bc27e397fe224a542e0d15de1 /net | |
parent | 6f07a8a3eb2adbfacd1322862368da4eb9dd3b45 (diff) |
[PATCH] ieee80211softmac: Fix mutex_lock at exit of ieee80211_softmac_get_genie
ieee80211softmac_wx_get_genie locks the associnfo mutex at
function exit. This patch fixes it. The patch is against Linus'
tree (commit af1713e0).
Signed-off-by: Ulrich Kunitz <kune@deine-taler.de>
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_wx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c index 480d72c7a42c..fa2f7da606a9 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, | |||
463 | err = -E2BIG; | 463 | err = -E2BIG; |
464 | } | 464 | } |
465 | spin_unlock_irqrestore(&mac->lock, flags); | 465 | spin_unlock_irqrestore(&mac->lock, flags); |
466 | mutex_lock(&mac->associnfo.mutex); | 466 | mutex_unlock(&mac->associnfo.mutex); |
467 | 467 | ||
468 | return err; | 468 | return err; |
469 | } | 469 | } |