diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/char/pcxx.c | |
parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/char/pcxx.c')
-rw-r--r-- | drivers/char/pcxx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/pcxx.c b/drivers/char/pcxx.c index 9fe8bcc23..b1c1bb3e3 100644 --- a/drivers/char/pcxx.c +++ b/drivers/char/pcxx.c @@ -633,8 +633,7 @@ static void pcxe_close(struct tty_struct * tty, struct file * filp) if(info->blocked_open) { if(info->close_delay) { current->state = TASK_INTERRUPTIBLE; - current->timeout = jiffies + info->close_delay; - schedule(); + schedule_timeout(info->close_delay); } wake_up_interruptible(&info->open_wait); } |