git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
cbe3364
..
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]);
}
res_reg[1]);
}
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(2 * HZ);
+ msleep(2000);
sony_get_toc();
}
sony_get_toc();
}
@@
-960,8
+959,7
@@
retry_cd_operation:
if (((result_buffer[0] & 0xf0) == 0x20)
&& (num_retries < MAX_CDU31A_RETRIES)) {
num_retries++;
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;
}
goto retry_cd_operation;
}