patch-2.1.127 linux/drivers/macintosh/macserial.c

• Lines: 20
• Date: Thu Nov 5 09:58:44 1998
• Orig file: v2.1.126/linux/drivers/macintosh/macserial.c
• Orig date: Thu Aug 6 14:06:32 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/macintosh/macserial.c linux/drivers/macintosh/macserial.c
@@ -1264,8 +1264,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);
 	}
@@ -1301,8 +1300,7 @@
 	while ((read_zsreg(info->zs_channel, 1) & ALL_SNT) == 0) {
 		current->state = TASK_INTERRUPTIBLE;
 		current->counter = 0;	/* make us low-priority */
-		current->timeout = jiffies + char_time;
-		schedule();
+		schedule_timeout(char_time);
 		if (signal_pending(current))
 			break;
 		if (timeout && ((orig_jiffies + timeout) < jiffies))