From cbea40e9870b901248ff39ad4b10f10abc4c7c26 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Tue, 13 May 2008 22:12:27 +0200 Subject: [PATCH] --- yaml --- r: 97089 b: refs/heads/master c: b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a h: refs/heads/master i: 97087: 6400b823fb75c900cb4419aeb425c98c30b91a89 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/airo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e27999a3d7ca..89f967e54c65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02969d296e91626d9942ea15f8a95fe056025ef1 +refs/heads/master: b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a diff --git a/trunk/drivers/net/wireless/airo.c b/trunk/drivers/net/wireless/airo.c index 45f47c1c0a35..efb7444a26ae 100644 --- a/trunk/drivers/net/wireless/airo.c +++ b/trunk/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);