| To: | philb@xxxxxxx |
|---|---|
| Subject: | [PATCH] net/3c505: replace schedule_timeout() with msleep() |
| From: | Nishanth Aravamudan <nacc@xxxxxxxxxx> |
| Date: | Sun, 1 May 2005 23:14:46 -0700 |
| Cc: | netdev@xxxxxxxxxxx, Kernel-Janitors <kernel-janitors@xxxxxxxxxxxxxx> |
| Sender: | netdev-bounce@xxxxxxxxxxx |
| User-agent: | Mutt/1.5.9i |
Use msleep() instead of schedule_timeout() to guarantee the task delays
as expected.
Signed-off-by: Nishanth Aravamudan <nacc@xxxxxxxxxx>
--- 2.6.12-rc3/drivers/net/3c505.c 2005-04-29 11:03:04.000000000 -0700
+++ 2.6.12-rc3-dev/drivers/net/3c505.c 2005-05-01 20:52:01.000000000 -0700
@@ -1317,8 +1317,7 @@ static int __init elp_sense(struct net_d
if (orig_HSR & DIR) {
/* If HCR.DIR is up, we pull it down. HSR.DIR should follow. */
outb(0, dev->base_addr + PORT_CONTROL);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(30*HZ/100);
+ msleep(300);
if (inb_status(addr) & DIR) {
if (elp_debug > 0)
printk(notfound_msg, 2);
@@ -1327,8 +1326,7 @@ static int __init elp_sense(struct net_d
} else {
/* If HCR.DIR is down, we pull it up. HSR.DIR should follow. */
outb(DIR, dev->base_addr + PORT_CONTROL);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(30*HZ/100);
+ msleep(300);
if (!(inb_status(addr) & DIR)) {
if (elp_debug > 0)
printk(notfound_msg, 3);
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [2.6 patch] drivers/net/arcnet/: possible cleanups, Adrian Bunk |
|---|---|
| Next by Date: | [PATCH] net/slip: replace schedule_timeout() with msleep_interruptible(), Nishanth Aravamudan |
| Previous by Thread: | [2.6 patch] drivers/net/arcnet/: possible cleanups, Adrian Bunk |
| Next by Thread: | [PATCH] net/slip: replace schedule_timeout() with msleep_interruptible(), Nishanth Aravamudan |
| Indexes: | [Date] [Thread] [Top] [All Lists] |