Commit b7acbdfb authored by Roel Kluin's avatar Roel Kluin Committed by John W. Linville

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: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 02969d29
...@@ -2904,7 +2904,7 @@ EXPORT_SYMBOL(init_airo_card); ...@@ -2904,7 +2904,7 @@ EXPORT_SYMBOL(init_airo_card);
static int waitbusy (struct airo_info *ai) { static int waitbusy (struct airo_info *ai) {
int delay = 0; int delay = 0;
while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) & (delay < 10000)) { while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) && (delay < 10000)) {
udelay (10); udelay (10);
if ((++delay % 20) == 0) if ((++delay % 20) == 0)
OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY); OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment