From b32d5a61a570ecf700e1590ded96771cf2b68113 Mon Sep 17 00:00:00 2001 From: Domen Puncer Date: Thu, 12 May 2005 22:21:51 -0400 Subject: [PATCH] --- yaml --- r: 1090 b: refs/heads/master c: c56943e655b0778d3a8517ae165ad4db15557b97 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/3c505.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a4540ea85e4b..f9134eaefb17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10a87fcf40ce8cee1e85d936cd6d7662943c804e +refs/heads/master: c56943e655b0778d3a8517ae165ad4db15557b97 diff --git a/trunk/drivers/net/3c505.c b/trunk/drivers/net/3c505.c index 76fa8cc24085..ad17f17e8e7a 100644 --- a/trunk/drivers/net/3c505.c +++ b/trunk/drivers/net/3c505.c @@ -1317,8 +1317,7 @@ static int __init elp_sense(struct net_device *dev) 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_device *dev) } 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);