Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c56943e6 authored by Domen Puncer's avatar Domen Puncer Committed by Jeff Garzik
Browse files

[PATCH] net/3c505: replace schedule_timeout() with msleep() 


  
  Use msleep() instead of schedule_timeout()
  to guarantee the task delays as expected.
  
  Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
  Acked-by: default avatarPhil Blundell <pb@nexus.co.uk>
  Signed-off-by: default avatarMaximilian Attems <janitor@sternwelten.at>
  Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
  Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 10a87fcf

drivers/net/3c505.c

+2 −4
Original line number Diff line number Diff line
@@ -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);