From: janitor@sternwelten.at Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems Signed-off-by: Andrew Morton --- 25-akpm/drivers/cdrom/cdu31a.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff -puN drivers/cdrom/cdu31a.c~cdu31a-replace-schedule_timeout-with-msleep drivers/cdrom/cdu31a.c --- 25/drivers/cdrom/cdu31a.c~cdu31a-replace-schedule_timeout-with-msleep 2004-09-02 15:29:20.280903600 -0700 +++ 25-akpm/drivers/cdrom/cdu31a.c 2004-09-02 15:29:20.285902840 -0700 @@ -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; } _