summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-12-26 20:31:59 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-12-28 16:20:06 -0500
commite8a4a6df7397eb3b43ad3139d3fe9b41df70d6b0 (patch)
tree7d95ac3d15238cf984b9633aef563d6faa0c347b
parent24feda0084722189468a65e20019cdd8ef99702b (diff)
downloadlinux-3.10-e8a4a6df7397eb3b43ad3139d3fe9b41df70d6b0.tar.gz
linux-3.10-e8a4a6df7397eb3b43ad3139d3fe9b41df70d6b0.tar.bz2
linux-3.10-e8a4a6df7397eb3b43ad3139d3fe9b41df70d6b0.zip
wl1251: timeout one too soon in wl1251_boot_run_firmware()
`loop' reaches INIT_LOOP + 1 after the loop. so if ACX_INTR_INIT_COMPLETE occurs in the last iteration the write occurs but also the error out as if a timeout occurred. This is probably very unlikely to ever occur. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: Kalle Valo <kalle.valo@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_boot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_boot.c b/drivers/net/wireless/wl12xx/wl1251_boot.c
index 2e733e7bdfd..28a80867408 100644
--- a/drivers/net/wireless/wl12xx/wl1251_boot.c
+++ b/drivers/net/wireless/wl12xx/wl1251_boot.c
@@ -256,7 +256,7 @@ int wl1251_boot_run_firmware(struct wl1251 *wl)
}
}
- if (loop >= INIT_LOOP) {
+ if (loop > INIT_LOOP) {
wl1251_error("timeout waiting for the hardware to "
"complete initialization");
return -EIO;