diff options
| author | Roel Kluin | 2008-05-13 22:12:27 +0200 |
|---|---|---|
| committer | John W. Linville | 2008-05-16 23:15:10 +0200 |
| commit | b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a (patch) | |
| tree | 3aa247dbd6fd6a0509a7c9a1a18a0ec4093dcc68 | |
| parent | libertas: fix command timeout after firmware failure (diff) | |
| download | kernel-qcow2-linux-b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a.tar.gz kernel-qcow2-linux-b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a.tar.xz kernel-qcow2-linux-b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a.zip | |
wireless, airo: waitbusy() won't delay
There will be no delay even when COMMAND_BUSY (defined 0x8000) is set:
0x8000 & (delay < 10000) will evaluate to 0 - when delay is 0.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/airo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 45f47c1c0a35..efb7444a26ae 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -2904,7 +2904,7 @@ EXPORT_SYMBOL(init_airo_card); static int waitbusy (struct airo_info *ai) { int delay = 0; - while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) & (delay < 10000)) { + while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) && (delay < 10000)) { udelay (10); if ((++delay % 20) == 0) OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY); |