mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
[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>
This commit is contained in:
parent
10a87fcf40
commit
c56943e655
1 changed files with 2 additions and 4 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue