patch-2.1.127 linux/drivers/cdrom/cdu31a.c

• Lines: 30
• Date: Wed Nov 4 12:09:43 1998
• Orig file: v2.1.126/linux/drivers/cdrom/cdu31a.c
• Orig date: Fri Oct 23 22:01:20 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/cdrom/cdu31a.c linux/drivers/cdrom/cdu31a.c
@@ -409,8 +409,7 @@
    if (cdu31a_irq <= 0)
    {
       current->state = TASK_INTERRUPTIBLE;
-      current->timeout = jiffies;
-      schedule();
+      schedule_timeout(0);
    }
    else /* Interrupt driven */
    {
@@ -753,8 +752,7 @@
    }
 
    current->state = TASK_INTERRUPTIBLE;
-   current->timeout = jiffies + 2*HZ;
-   schedule();
+   schedule_timeout(2*HZ);
 
    sony_get_toc();
 }
@@ -1012,8 +1010,7 @@
    {
       num_retries++;
       current->state = TASK_INTERRUPTIBLE;
-      current->timeout = jiffies + HZ/10; /* Wait .1 seconds on retries */
-      schedule();
+      schedule_timeout(HZ/10);  /* Wait .1 seconds on retries */
       goto retry_cd_operation;
    }