diff options
author | David S. Miller <davem@davemloft.net> | 2010-10-25 16:04:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-25 16:04:48 -0400 |
commit | 5202e173d7bc5ff832a4f36e66f26e00feb343c6 (patch) | |
tree | cd2aa17c18842c61380e56aeb5c89aba1323e016 /drivers/net/tokenring/tms380tr.c | |
parent | 11a766ce915fc9f8663714eac6d59239388534ea (diff) |
tms380tr: Use mdelay() in tms380tr_wait().
This driver tries to do up to half-second udelay()
calls, which overflows on x86-64.
Reported-by: Andi Kleen <andi@firstfloor.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tokenring/tms380tr.c')
-rw-r--r-- | drivers/net/tokenring/tms380tr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index 663b8860a531..793020347e54 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c | |||
@@ -1220,7 +1220,7 @@ void tms380tr_wait(unsigned long time) | |||
1220 | tmp = schedule_timeout_interruptible(tmp); | 1220 | tmp = schedule_timeout_interruptible(tmp); |
1221 | } while(time_after(tmp, jiffies)); | 1221 | } while(time_after(tmp, jiffies)); |
1222 | #else | 1222 | #else |
1223 | udelay(time); | 1223 | mdelay(time / 1000); |
1224 | #endif | 1224 | #endif |
1225 | } | 1225 | } |
1226 | 1226 | ||