diff options
author | Luciano Coelho <luciano.coelho@nokia.com> | 2010-03-26 06:53:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-03-31 14:39:14 -0400 |
commit | 2f826f55404ca43efced94d548356182820e764f (patch) | |
tree | 3b819742784a1d2a529c08fda28488df25b04658 /drivers/net/wireless/wl12xx/wl1271_boot.c | |
parent | 99d84c1de8fdf5f9b09f07fdbc628857a040bf8b (diff) |
wl1271: wait for disconnect command complete event
Wait for the DISCONNECT_EVENT_COMPLETE_ID event after sending a disconnect
command.
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_boot.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_boot.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.c b/drivers/net/wireless/wl12xx/wl1271_boot.c index 2c7e5612d5b..7acef88df1f 100644 --- a/drivers/net/wireless/wl12xx/wl1271_boot.c +++ b/drivers/net/wireless/wl12xx/wl1271_boot.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * This file is part of wl1271 | 2 | * This file is part of wl1271 |
3 | * | 3 | * |
4 | * Copyright (C) 2008-2009 Nokia Corporation | 4 | * Copyright (C) 2008-2010 Nokia Corporation |
5 | * | 5 | * |
6 | * Contact: Luciano Coelho <luciano.coelho@nokia.com> | 6 | * Contact: Luciano Coelho <luciano.coelho@nokia.com> |
7 | * | 7 | * |
@@ -411,7 +411,8 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl) | |||
411 | wl->event_mask = BSS_LOSE_EVENT_ID | | 411 | wl->event_mask = BSS_LOSE_EVENT_ID | |
412 | SCAN_COMPLETE_EVENT_ID | | 412 | SCAN_COMPLETE_EVENT_ID | |
413 | PS_REPORT_EVENT_ID | | 413 | PS_REPORT_EVENT_ID | |
414 | JOIN_EVENT_COMPLETE_ID; | 414 | JOIN_EVENT_COMPLETE_ID | |
415 | DISCONNECT_EVENT_COMPLETE_ID; | ||
415 | 416 | ||
416 | ret = wl1271_event_unmask(wl); | 417 | ret = wl1271_event_unmask(wl); |
417 | if (ret < 0) { | 418 | if (ret < 0) { |