diff options
author | Domen Puncer <domen@coderock.org> | 2005-05-12 22:21:51 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-12 22:21:51 -0400 |
commit | c56943e655b0778d3a8517ae165ad4db15557b97 (patch) | |
tree | 66756bd2284a99617f7c0a5e7ee6164b3df0f7ff /drivers/net | |
parent | 10a87fcf40ce8cee1e85d936cd6d7662943c804e (diff) |
[PATCH] net/3c505: replace schedule_timeout() with msleep()
Use msleep() instead of schedule_timeout()
to guarantee the task delays as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Acked-by: Phil Blundell <pb@nexus.co.uk>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/3c505.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index 76fa8cc24085..ad17f17e8e7a 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c | |||
@@ -1317,8 +1317,7 @@ static int __init elp_sense(struct net_device *dev) | |||
1317 | if (orig_HSR & DIR) { | 1317 | if (orig_HSR & DIR) { |
1318 | /* If HCR.DIR is up, we pull it down. HSR.DIR should follow. */ | 1318 | /* If HCR.DIR is up, we pull it down. HSR.DIR should follow. */ |
1319 | outb(0, dev->base_addr + PORT_CONTROL); | 1319 | outb(0, dev->base_addr + PORT_CONTROL); |
1320 | set_current_state(TASK_UNINTERRUPTIBLE); | 1320 | msleep(300); |
1321 | schedule_timeout(30*HZ/100); | ||
1322 | if (inb_status(addr) & DIR) { | 1321 | if (inb_status(addr) & DIR) { |
1323 | if (elp_debug > 0) | 1322 | if (elp_debug > 0) |
1324 | printk(notfound_msg, 2); | 1323 | printk(notfound_msg, 2); |
@@ -1327,8 +1326,7 @@ static int __init elp_sense(struct net_device *dev) | |||
1327 | } else { | 1326 | } else { |
1328 | /* If HCR.DIR is down, we pull it up. HSR.DIR should follow. */ | 1327 | /* If HCR.DIR is down, we pull it up. HSR.DIR should follow. */ |
1329 | outb(DIR, dev->base_addr + PORT_CONTROL); | 1328 | outb(DIR, dev->base_addr + PORT_CONTROL); |
1330 | set_current_state(TASK_UNINTERRUPTIBLE); | 1329 | msleep(300); |
1331 | schedule_timeout(30*HZ/100); | ||
1332 | if (!(inb_status(addr) & DIR)) { | 1330 | if (!(inb_status(addr) & DIR)) { |
1333 | if (elp_debug > 0) | 1331 | if (elp_debug > 0) |
1334 | printk(notfound_msg, 3); | 1332 | printk(notfound_msg, 3); |