From: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Mon, 20 Jun 2005 21:54:12 +0000 (+0200)
Subject: [PATCH] net/pcnet32: replace schedule_timeout() with msleep_interruptible()
X-Git-Tag: v2.6.13-rc1~51^2~40^2~32
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f17697a37ccd2128f37250d2e7715c59931dc458;p=linux-2.6-omap-h63xx.git

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

Use msleep_interruptible() instead of schedule_timeout() to
guarantee the task delays as expected.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
---

diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 13f11487696..3213f3e5048 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -850,7 +850,7 @@ static int pcnet32_phys_id(struct net_device *dev, u32 data)
     if ((!data) || (data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ)))
     data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
 
-    schedule_timeout(data * HZ);
+    msleep_interruptible(data * 1000);
     del_timer_sync(&lp->blink_timer);
 
     /* Restore the original value of the bcrs */