2009-12-26 19:29:14

by Roel Kluin

Subject: [PATCH] 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 <[email protected]>
---
drivers/net/wireless/wl12xx/wl1251_boot.c | 2 +-
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 2e733e7..28a8086 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;

2009-12-27 08:28:26

by Kalle Valo

Subject: Re: [PATCH] wl1251: timeout one too soon in wl1251_boot_run_firmware()

Roel Kluin <[email protected]> writes:

> `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.

Thank you for fixing this.

> Signed-off-by: Roel Kluin <[email protected]>

Acked-by: Kalle Valo <[email protected]>

I think John can take this. As Roel mentioned, this is nothing
critical and, if needed, can wait until 2.6.34.

--
Kalle Valo