diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-09-02 13:30:07 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-02 13:30:07 -0400 |
| commit | 78ab952717b62c0ba6ca7f7a27eaa0486685e45f (patch) | |
| tree | a4ab2bfc578f279fc6847031f501d84c75057531 /drivers/net/wireless/wl12xx/wl1271_scan.c | |
| parent | 3e502e63586920f219ed2590f69c1f5a8888cfa4 (diff) | |
| parent | 85f72bc839705294b32b6c16b491c0422f0a71b3 (diff) | |
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.c | 2 |
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 30dc1000f563..e4950c8e396e 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) | |||
| 215 | break; | 215 | break; |
| 216 | 216 | ||
| 217 | case WL1271_SCAN_STATE_DONE: | 217 | case WL1271_SCAN_STATE_DONE: |
| 218 | mutex_unlock(&wl->mutex); | ||
| 219 | ieee80211_scan_completed(wl->hw, false); | 218 | ieee80211_scan_completed(wl->hw, false); |
| 220 | mutex_lock(&wl->mutex); | ||
| 221 | 219 | ||
| 222 | kfree(wl->scan.scanned_ch); | 220 | kfree(wl->scan.scanned_ch); |
| 223 | wl->scan.scanned_ch = NULL; | 221 | wl->scan.scanned_ch = NULL; |