summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJeff Garzik2007-12-18 00:05:43 +0100
committerJeff Garzik2007-12-18 00:05:43 +0100
commit8085106a58366fb2c6c14d89e3d4395d2702d4a1 (patch)
tree9c349f8ad0d6536cfd16f046776d9c8a71c81c21 /net
parentsis190 endianness (diff)
parentiwlwifi: fix rf_kill state inconsistent during suspend and resume (diff)
downloadkernel-qcow2-linux-8085106a58366fb2c6c14d89e3d4395d2702d4a1.tar.gz
kernel-qcow2-linux-8085106a58366fb2c6c14d89e3d4395d2702d4a1.tar.xz
kernel-qcow2-linux-8085106a58366fb2c6c14d89e3d4395d2702d4a1.zip
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/mac80211/ieee80211_rate.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_rate.c b/net/mac80211/ieee80211_rate.c
index 7254bd609839..3260a4a0ecc5 100644
--- a/net/mac80211/ieee80211_rate.c
+++ b/net/mac80211/ieee80211_rate.c
@@ -33,6 +33,7 @@ int ieee80211_rate_control_register(struct rate_control_ops *ops)
if (!strcmp(alg->ops->name, ops->name)) {
/* don't register an algorithm twice */
WARN_ON(1);
+ mutex_unlock(&rate_ctrl_mutex);
return -EALREADY;
}
}