From bbf763773f21963929857685c7e16d3ee7f922b0 Mon Sep 17 00:00:00 2001 From: Nishanth Aravamudan Date: Sat, 10 Sep 2005 00:27:29 -0700 Subject: [PATCH] --- yaml --- r: 8419 b: refs/heads/master c: 2ddee1b7a732dc96d479afaa7d0a26aa53990089 h: refs/heads/master i: 8417: aefb9af030284141c07182d2ebcde9644ccf700c 8415: 3936d83c6d808985d88cc5710f7aae98aa31b513 v: v3 --- [refs] | 2 +- trunk/drivers/cdrom/sbpcd.c | 3 +-- trunk/drivers/cdrom/sonycd535.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 93ddc20fecae..4874de9b56b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86e8486245a01f05a3267b2e8b5c02c2303b670d +refs/heads/master: 2ddee1b7a732dc96d479afaa7d0a26aa53990089 diff --git a/trunk/drivers/cdrom/sbpcd.c b/trunk/drivers/cdrom/sbpcd.c index 0b7d7412c4a5..466e9c2974bd 100644 --- a/trunk/drivers/cdrom/sbpcd.c +++ b/trunk/drivers/cdrom/sbpcd.c @@ -827,8 +827,7 @@ static void mark_timeout_audio(u_long i) static void sbp_sleep(u_int time) { sti(); - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(time); + schedule_timeout_interruptible(time); sti(); } /*==========================================================================*/ diff --git a/trunk/drivers/cdrom/sonycd535.c b/trunk/drivers/cdrom/sonycd535.c index 9f22e8f1f6c0..e65659926432 100644 --- a/trunk/drivers/cdrom/sonycd535.c +++ b/trunk/drivers/cdrom/sonycd535.c @@ -1478,8 +1478,7 @@ static int __init sony535_init(void) /* look for the CD-ROM, follows the procedure in the DOS driver */ inb(select_unit_reg); /* wait for 40 18 Hz ticks (reverse-engineered from DOS driver) */ - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout((HZ+17)*40/18); + schedule_timeout_interruptible((HZ+17)*40/18); inb(result_reg); outb(0, read_status_reg); /* does a reset? */