diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /drivers/net/wireless/airo.c | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -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 17ced37e55ed..1e1446bf4b48 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
| @@ -2906,7 +2906,7 @@ EXPORT_SYMBOL(init_airo_card); | |||
| 2906 | 2906 | ||
| 2907 | static int waitbusy (struct airo_info *ai) { | 2907 | static int waitbusy (struct airo_info *ai) { |
| 2908 | int delay = 0; | 2908 | int delay = 0; |
| 2909 | while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) && (delay < 10000)) { | 2909 | while ((IN4500(ai, COMMAND) & COMMAND_BUSY) && (delay < 10000)) { |
| 2910 | udelay (10); | 2910 | udelay (10); |
| 2911 | if ((++delay % 20) == 0) | 2911 | if ((++delay % 20) == 0) |
| 2912 | OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY); | 2912 | OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY); |