patch-2.1.127 linux/drivers/char/rocket.c

• Lines: 32
• Date: Thu Nov 5 09:58:43 1998
• Orig file: v2.1.126/linux/drivers/char/rocket.c
• Orig date: Sat Sep 5 16:46:40 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/char/rocket.c linux/drivers/char/rocket.c
@@ -1181,8 +1181,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);
 	} else {
@@ -1269,10 +1268,9 @@
 static void send_break(	struct r_port * info, int duration)
 {
 	current->state = TASK_INTERRUPTIBLE;
-	current->timeout = jiffies + duration;
 	cli();
 	sSendBreak(&info->channel);
-	schedule();
+	schedule_timeout(duration);
 	sClrBreak(&info->channel);
 	sti();
 }
@@ -1666,8 +1664,7 @@
 #endif
 		current->state = TASK_INTERRUPTIBLE;
 		current->counter = 0;	/* make us low-priority */
-		current->timeout = jiffies + check_time;
-		schedule();
+		schedule_timeout(check_time);
 		if (signal_pending(current))
 			break;
 	}