summaryrefslogtreecommitdiffstats
path: root/drivers/char/epca.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-01-04 16:03:48 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-01-04 16:03:48 +0000
commit78c388aed2b7184182c08428db1de6c872d815f5 (patch)
tree4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/char/epca.c
parenteb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff)
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/char/epca.c')
-rw-r--r--drivers/char/epca.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 9ddf7c33d..f4224bd55 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -647,8 +647,7 @@ static void pc_close(struct tty_struct * tty, struct file * filp)
if (ch->close_delay)
{
current->state = TASK_INTERRUPTIBLE;
- current->timeout = jiffies + ch->close_delay;
- schedule();
+ schedule_timeout(ch->close_delay);
}
wake_up_interruptible(&ch->open_wait);