Skip to contentSkip to conversation

char/specialix: replace schedule_timeout() with msleep_interruptible()

PATCH In review [email protected] 1 participant 1 message Sep 23, 2004 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 20/26 char/specialix: replace schedule_timeout() with msleep_interruptible()

Any comments would be appreciated.

Description: Use msleep() instead of schedule_timeout() to guarantee the task delays as expected.

---

 linux-2.6.9-rc2-bk7-max/drivers/char/specialix.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
drivers/char/specialix.c renamed from drivers/char/specialix.c~msleep_interruptible-drivers_char_specialix +2 -4
diff -puN drivers/char/specialix.c~msleep_interruptible-drivers_char_specialix drivers/char/specialix.c
@@ -1452,8 +1452,7 @@ static void sx_close(struct tty_struct *
 		 */
 		timeout = jiffies+HZ;
 		while(port->IER & IER_TXEMPTY) {
-			current->state = TASK_INTERRUPTIBLE;
- 			schedule_timeout(port->timeout);
+			msleep_interruptible(jiffies_to_msecs(port->timeout));
 			if (time_after(jiffies, timeout)) {
 				printk (KERN_INFO "Timeout waiting for close\n");
 				break;
@@ -1471,8 +1470,7 @@ static void sx_close(struct tty_struct *
 	port->tty = NULL;
 	if (port->blocked_open) {
 		if (port->close_delay) {
-			current->state = TASK_INTERRUPTIBLE;
-			schedule_timeout(port->close_delay);
+			msleep_interruptible(jiffies_to_msecs(port->close_delay));
 		}
 		wake_up_interruptible(&port->open_wait);
 	}

_