diff options
Diffstat (limited to 'drivers/cdrom')
-rw-r--r-- | drivers/cdrom/sbpcd.c | 3 | ||||
-rw-r--r-- | drivers/cdrom/sonycd535.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c index 0b7d7412c4a5..466e9c2974bd 100644 --- a/drivers/cdrom/sbpcd.c +++ b/drivers/cdrom/sbpcd.c | |||
@@ -827,8 +827,7 @@ static void mark_timeout_audio(u_long i) | |||
827 | static void sbp_sleep(u_int time) | 827 | static void sbp_sleep(u_int time) |
828 | { | 828 | { |
829 | sti(); | 829 | sti(); |
830 | current->state = TASK_INTERRUPTIBLE; | 830 | schedule_timeout_interruptible(time); |
831 | schedule_timeout(time); | ||
832 | sti(); | 831 | sti(); |
833 | } | 832 | } |
834 | /*==========================================================================*/ | 833 | /*==========================================================================*/ |
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c index 9f22e8f1f6c0..e65659926432 100644 --- a/drivers/cdrom/sonycd535.c +++ b/drivers/cdrom/sonycd535.c | |||
@@ -1478,8 +1478,7 @@ static int __init sony535_init(void) | |||
1478 | /* look for the CD-ROM, follows the procedure in the DOS driver */ | 1478 | /* look for the CD-ROM, follows the procedure in the DOS driver */ |
1479 | inb(select_unit_reg); | 1479 | inb(select_unit_reg); |
1480 | /* wait for 40 18 Hz ticks (reverse-engineered from DOS driver) */ | 1480 | /* wait for 40 18 Hz ticks (reverse-engineered from DOS driver) */ |
1481 | set_current_state(TASK_INTERRUPTIBLE); | 1481 | schedule_timeout_interruptible((HZ+17)*40/18); |
1482 | schedule_timeout((HZ+17)*40/18); | ||
1483 | inb(result_reg); | 1482 | inb(result_reg); |
1484 | 1483 | ||
1485 | outb(0, read_status_reg); /* does a reset? */ | 1484 | outb(0, read_status_reg); /* does a reset? */ |