diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-17 15:54:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-17 15:54:40 -0700 |
| commit | 75a241f959a65ec9bde237d1af1a34ef794f0c9c (patch) | |
| tree | 6a2b9fe1b525b69ac094d6ae088e00cb5d626969 /drivers/net/wireless/orinoco/hw.c | |
| parent | e18e37e50966f137f8a3b807fe0da7703779be34 (diff) | |
| parent | 957b0516f7881284b48f2f2e4a909a1c5de0ddf8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/orinoco/hw.c')
| -rw-r--r-- | drivers/net/wireless/orinoco/hw.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/orinoco/hw.c b/drivers/net/wireless/orinoco/hw.c index 081428d9409e..632fac86a308 100644 --- a/drivers/net/wireless/orinoco/hw.c +++ b/drivers/net/wireless/orinoco/hw.c @@ -372,15 +372,13 @@ int __orinoco_hw_set_tkip_key(hermes_t *hw, int key_idx, int set_tx, } /* Wait upto 100ms for tx queue to empty */ - k = 100; - do { - k--; + for (k = 100; k > 0; k--) { udelay(1000); ret = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_TXQUEUEEMPTY, &xmitting); - if (ret) + if (ret || !xmitting) break; - } while ((k > 0) && xmitting); + } if (k == 0) ret = -ETIMEDOUT; |