patch-2.1.127 linux/drivers/sgi/char/sgiserial.c

• Lines: 22
• Date: Thu Nov 5 09:58:44 1998
• Orig file: v2.1.126/linux/drivers/sgi/char/sgiserial.c
• Orig date: Fri May 8 23:14:50 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/sgi/char/sgiserial.c linux/drivers/sgi/char/sgiserial.c
@@ -1279,10 +1279,9 @@
 	if (!info->port)
 		return;
 	current->state = TASK_INTERRUPTIBLE;
-	current->timeout = jiffies + duration;
 	cli();
 	write_zsreg(info->zs_channel, 5, (info->curregs[5] | SND_BRK));
-	schedule();
+	schedule_timeout(duration);
 	write_zsreg(info->zs_channel, 5, info->curregs[5]);
 	sti();
 }
@@ -1483,8 +1482,7 @@
 	if (info->blocked_open) {
 		if (info->close_delay) {
 			current->state = TASK_INTERRUPTIBLE;
-			current->timeout = jiffies + info->close_delay;
-			schedule();
+			schedule_timeout(info->close_delay);
 		}
 		wake_up_interruptible(&info->open_wait);
 	}