summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1271_scan.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-09-02 13:30:07 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-09-02 13:30:07 -0400
commit78ab952717b62c0ba6ca7f7a27eaa0486685e45f (patch)
treea4ab2bfc578f279fc6847031f501d84c75057531 /drivers/net/wireless/wl12xx/wl1271_scan.c
parent3e502e63586920f219ed2590f69c1f5a8888cfa4 (diff)
parent85f72bc839705294b32b6c16b491c0422f0a71b3 (diff)
downloadop-kernel-dev-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.zip
op-kernel-dev-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_scan.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_scan.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_scan.c b/drivers/net/wireless/wl12xx/wl1271_scan.c
index 30dc100..e4950c8 100644
--- a/drivers/net/wireless/wl12xx/wl1271_scan.c
+++ b/drivers/net/wireless/wl12xx/wl1271_scan.c
@@ -215,9 +215,7 @@ void wl1271_scan_stm(struct wl1271 *wl)
break;
case WL1271_SCAN_STATE_DONE:
- mutex_unlock(&wl->mutex);
ieee80211_scan_completed(wl->hw, false);
- mutex_lock(&wl->mutex);
kfree(wl->scan.scanned_ch);
wl->scan.scanned_ch = NULL;
OpenPOWER on IntegriCloud