]> err.no Git - linux-2.6/commitdiff
[PATCH] ieee80211softmac: Fix mutex_lock at exit of ieee80211_softmac_get_genie
authorUlrich Kunitz <kune@deine-taler.de>
Sun, 10 Dec 2006 17:27:01 +0000 (18:27 +0100)
committerJohn W. Linville <linville@linville-t43.mobile>
Tue, 19 Dec 2006 21:19:45 +0000 (16:19 -0500)
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>
net/ieee80211/softmac/ieee80211softmac_wx.c

index 480d72c7a42ca861bb9524a631ea23be8a03feaf..fa2f7da606a95488f5893b5cf4538c6083b770b9 100644 (file)
@@ -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;
 }