]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
tms380tr: Use mdelay() in tms380tr_wait().
authorDavid S. Miller <davem@davemloft.net>
Mon, 25 Oct 2010 20:04:48 +0000 (13:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Oct 2010 20:04:48 +0000 (13:04 -0700)
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>
drivers/net/tokenring/tms380tr.c

index 663b8860a5317a4f37a41813e79fda4bd8159792..793020347e543524708512d5ad0e0681ba0ad1fd 100644 (file)
@@ -1220,7 +1220,7 @@ void tms380tr_wait(unsigned long time)
                tmp = schedule_timeout_interruptible(tmp);
        } while(time_after(tmp, jiffies));
 #else
-       udelay(time);
+       mdelay(time / 1000);
 #endif
 }