Skip to content

Commit

Permalink
[PATCH] net/3c505: replace schedule_timeout() with msleep()
Browse files Browse the repository at this point in the history
  
  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>
  • Loading branch information
Domen Puncer authored and Jeff Garzik committed May 13, 2005
1 parent 10a87fc commit c56943e
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/net/3c505.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit c56943e

Please sign in to comment.