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
/
mcd.c
diff --git
a/drivers/cdrom/mcd.c
b/drivers/cdrom/mcd.c
index
4cb0fb4
..
b4f5e02
100644
(file)
--- a/
drivers/cdrom/mcd.c
+++ b/
drivers/cdrom/mcd.c
@@
-1021,10
+1021,9
@@
static int mcd_open(struct cdrom_device_info *cdi, int purpose)
st = statusCmd(); /* check drive status */
if (st == -1)
goto err_out; /* drive doesn't respond */
st = statusCmd(); /* check drive status */
if (st == -1)
goto err_out; /* drive doesn't respond */
- if ((st & MST_READY) == 0) { /* no disk? wait a sec... */
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(HZ);
- }
+ if ((st & MST_READY) == 0) /* no disk? wait a sec... */
+ msleep(1000);
+
} while (((st & MST_READY) == 0) && count++ < MCD_RETRY_ATTEMPTS);
if (updateToc() < 0)
} while (((st & MST_READY) == 0) && count++ < MCD_RETRY_ATTEMPTS);
if (updateToc() < 0)