aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1271_boot.c
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@nokia.com>2010-03-26 06:53:20 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-03-31 14:39:13 -0400
commit99d84c1de8fdf5f9b09f07fdbc628857a040bf8b (patch)
tree1ac0570e5c04f9d581ede7ee8931e8995497b0f7 /drivers/net/wireless/wl12xx/wl1271_boot.c
parent9560134ff929a037f0c967ae47089586f4b34390 (diff)
wl1271: wait for join command complete event
Poll for join command completion instead of waiting blindly for 10 msecs. There is a timeout of 100 msecs, if the command doesn't complete by then, we return an error code. 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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.c b/drivers/net/wireless/wl12xx/wl1271_boot.c
index 4195298b5abc..2c7e5612d5ba 100644
--- a/drivers/net/wireless/wl12xx/wl1271_boot.c
+++ b/drivers/net/wireless/wl12xx/wl1271_boot.c
@@ -410,7 +410,8 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl)
410 /* unmask required mbox events */ 410 /* unmask required mbox events */
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 415
415 ret = wl1271_event_unmask(wl); 416 ret = wl1271_event_unmask(wl);
416 if (ret < 0) { 417 if (ret < 0) {