summaryrefslogtreecommitdiff
path: root/drivers/block/paride/pg.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-14 08:57:30 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-14 08:57:30 -0400
commitdbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9 (patch)
tree8641efeba632bddfa0e486b41a5f19578b1a1a31 /drivers/block/paride/pg.c
parent142e27fc8a3619471669d6241784eec9167c47d1 (diff)
parent2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff)
downloadlwn-dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9.tar.gz
lwn-dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/block/paride/pg.c')
-rw-r--r--drivers/block/paride/pg.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 84d8e291ed96..b3982395f22b 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -276,8 +276,7 @@ static inline u8 DRIVE(struct pg *dev)
static void pg_sleep(int cs)
{
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(cs);
+ schedule_timeout_interruptible(cs);
}
static int pg_wait(struct pg *dev, int go, int stop, unsigned long tmo, char *msg)