X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fmac89x0.c;h=f65b0db111b8d5b49ac30058b68cb3a9b99caf7a;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=8c08255899eaa2639f2230578c09dd933dd0089c;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c index 8c0825589..f65b0db11 100644 --- a/drivers/net/mac89x0.c +++ b/drivers/net/mac89x0.c @@ -98,6 +98,7 @@ static char *version = #include #include #include +#include #include #include @@ -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;