Commit 51cee03b authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Linus Torvalds

[PATCH] net/mac89x0: replace schedule_timeout() with msleep_interruptible()

Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bec6feb6
...@@ -98,6 +98,7 @@ static char *version = ...@@ -98,6 +98,7 @@ static char *version =
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/delay.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/bitops.h> #include <asm/bitops.h>
...@@ -308,8 +309,7 @@ void __init reset_chip(struct net_device *dev) ...@@ -308,8 +309,7 @@ void __init reset_chip(struct net_device *dev)
writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET); writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET);
/* wait 30 ms */ /* wait 30 ms */
current->state = TASK_INTERRUPTIBLE; msleep_interruptible(30);
schedule_timeout(30*HZ/1000);
/* Wait until the chip is reset */ /* Wait until the chip is reset */
reset_start_time = jiffies; reset_start_time = jiffies;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment