vserver 1.9.3

[linux-2.6.git] / drivers / cdrom / cdu31a.c

diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c
index 3a758a0..09873fa 100644 (file)
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
@@ -729,8 +729,7 @@ static void restart_on_error(void)
                       res_reg[1]);
        }
 
-       current->state = TASK_INTERRUPTIBLE;
-       schedule_timeout(2 * HZ);
+       msleep(2000);
 
        sony_get_toc();
 }
@@ -960,8 +959,7 @@ retry_cd_operation:
        if (((result_buffer[0] & 0xf0) == 0x20)
            && (num_retries < MAX_CDU31A_RETRIES)) {
                num_retries++;
-               current->state = TASK_INTERRUPTIBLE;
-               schedule_timeout(HZ / 10);      /* Wait .1 seconds on retries */
+               msleep(100);
                goto retry_cd_operation;
        }
 
@@ -3179,7 +3177,7 @@ static int scd_block_release(struct inode *inode, struct file *file)
 static int scd_block_ioctl(struct inode *inode, struct file *file,
                                unsigned cmd, unsigned long arg)
 {
-       return cdrom_ioctl(&scd_info, inode, cmd, arg);
+       return cdrom_ioctl(file, &scd_info, inode, cmd, arg);
 }
 
 static int scd_block_media_changed(struct gendisk *disk)