git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
ath
/
ath9k
/
hw.c
diff --git
a/drivers/net/wireless/ath/ath9k/hw.c
b/drivers/net/wireless/ath/ath9k/hw.c
index 0992f7c70e1ac7a93d4468c8d3484df49b0a714e..c8a9dfab1fee2ea4778046b186428ba3f014e054 100644
(file)
--- a/
drivers/net/wireless/ath/ath9k/hw.c
+++ b/
drivers/net/wireless/ath/ath9k/hw.c
@@
-1547,6
+1547,7
@@
bool ath9k_hw_check_alive(struct ath_hw *ah)
if (reg != last_val)
return true;
+ udelay(1);
last_val = reg;
if ((reg & 0x7E7FFFEF) == 0x00702400)
continue;
@@
-1559,8
+1560,6
@@
bool ath9k_hw_check_alive(struct ath_hw *ah)
default:
return true;
}
-
- udelay(1);
} while (count-- > 0);
return false;