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
/
scsi
/
sr_ioctl.c
diff --git
a/drivers/scsi/sr_ioctl.c
b/drivers/scsi/sr_ioctl.c
index
7d24b57
..
1ddb5f2
100644
(file)
--- a/
drivers/scsi/sr_ioctl.c
+++ b/
drivers/scsi/sr_ioctl.c
@@
-7,6
+7,7
@@
#include <linux/blkdev.h>
#include <linux/blkpg.h>
#include <linux/cdrom.h>
#include <linux/blkdev.h>
#include <linux/blkpg.h>
#include <linux/cdrom.h>
+#include <linux/delay.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@
-131,7
+132,7
@@
int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
printk(KERN_INFO "%s: CDROM not ready yet.\n", cd->cdi.name);
if (retries++ < 10) {
/* sleep 2 sec and try again */
printk(KERN_INFO "%s: CDROM not ready yet.\n", cd->cdi.name);
if (retries++ < 10) {
/* sleep 2 sec and try again */
- s
csi_sleep(2 * HZ
);
+ s
sleep(2
);
goto retry;
} else {
/* 20 secs are enough? */
goto retry;
} else {
/* 20 secs are enough? */