diff options
| author | Nishanth Aravamudan <nacc@us.ibm.com> | 2004-10-18 18:24:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 18:24:08 -0700 |
| commit | 51cee03bbaea3d51142dd36a2a51534455bf1c3b (patch) | |
| tree | 60e06d60a00cdb0c005a36ad7c82698645b36b7b | |
| parent | bec6feb6f7f6a5def0b5c8eb64799bdacef06ba8 (diff) | |
[PATCH] net/mac89x0: replace schedule_timeout() with msleep_interruptible()
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/net/mac89x0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c index 8c08255899ea..f65b0db111b8 100644 --- a/drivers/net/mac89x0.c +++ b/drivers/net/mac89x0.c @@ -98,6 +98,7 @@ static char *version = #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/skbuff.h> +#include <linux/delay.h> #include <asm/system.h> #include <asm/bitops.h> @@ -308,8 +309,7 @@ void __init reset_chip(struct net_device *dev) writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET); /* wait 30 ms */ - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(30*HZ/1000); + msleep_interruptible(30); /* Wait until the chip is reset */ reset_start_time = jiffies; |