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

Next file: linux/drivers/cdrom/mcdx.c
Previous file: linux/drivers/cdrom/gscd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.126/linux/drivers/cdrom/mcd.c linux/drivers/cdrom/mcd.c
@@ -1100,8 +1100,7 @@
                         return -EIO;            /* drive doesn't respond */
                 if ((st & MST_READY) == 0) {    /* no disk? wait a sec... */
                         current->state = TASK_INTERRUPTIBLE;
-                        current->timeout = jiffies + HZ;
-                        schedule();
+                        schedule_timeout(HZ);
                 }
         } while (((st & MST_READY) == 0) && count++ < MCD_RETRY_ATTEMPTS);
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov