diff options
| author | Roel Kluin <12o3l@tiscali.nl> | 2007-11-13 03:16:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-11-13 03:16:17 -0800 |
| commit | 9db7720cca8f55a1e0c8d0dc1587e35dca50afbf (patch) | |
| tree | 6ca945d7594933d8aa4157c273da08c178000808 /drivers/net | |
| parent | 81d9ddae856678c45297550e9353c8a5a7fd6438 (diff) | |
| download | blackbird-op-linux-9db7720cca8f55a1e0c8d0dc1587e35dca50afbf.tar.gz blackbird-op-linux-9db7720cca8f55a1e0c8d0dc1587e35dca50afbf.zip | |
[MYRI_SBUS]: Prevent that myri_do_handshake lies about ticks.
With '<=' tick can be incremented up to 26, The last loop is redundant
since even when 'softstate' becomes 'STATE_READY', 'if (tick > 25)'
will still cause the function to return -1,
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/myri_sbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index 8d29319cc5cb..656a260fc956 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c @@ -134,7 +134,7 @@ static int myri_do_handshake(struct myri_eth *mp) myri_disable_irq(mp->lregs, cregs); - while (tick++ <= 25) { + while (tick++ < 25) { u32 softstate; /* Wake it up. */ |
