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

• Lines: 30
• Date: Sat Oct 31 11:05:20 1998
• Orig file: v2.1.126/linux/drivers/char/cyclades.c
• Orig date: Wed Sep 9 14:51:07 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/char/cyclades.c linux/drivers/char/cyclades.c
@@ -2590,8 +2590,7 @@
 #endif
 	    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))
@@ -2604,8 +2603,7 @@
     /* Run one more char cycle */
     current->state = TASK_INTERRUPTIBLE;
     current->counter = 0;	/* make us low-priority */
-    current->timeout = jiffies + (char_time * 5);
-    schedule();
+    schedule_timeout(char_time * 5);
     current->state = TASK_RUNNING;
 #ifdef CY_DEBUG_WAIT_UNTIL_SENT
     printk("Clean (jiff=%lu)...done\n", jiffies);
@@ -2737,8 +2735,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);
     }