aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2008-05-13 16:12:27 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-05-16 17:15:10 -0400
commitb7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a (patch)
tree3aa247dbd6fd6a0509a7c9a1a18a0ec4093dcc68 /drivers
parent02969d296e91626d9942ea15f8a95fe056025ef1 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/airo.c2
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);
2904 2904
2905static int waitbusy (struct airo_info *ai) { 2905static int waitbusy (struct airo_info *ai) {
2906 int delay = 0; 2906 int delay = 0;
2907 while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) & (delay < 10000)) { 2907 while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) && (delay < 10000)) {
2908 udelay (10); 2908 udelay (10);
2909 if ((++delay % 20) == 0) 2909 if ((++delay % 20) == 0)
2910 OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY); 2910 OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY);