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/rocket.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/rocket.c')
| -rw-r--r-- | drivers/char/rocket.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index c661f8238..9dff48416 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c @@ -1181,8 +1181,7 @@ static void rp_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); } else { @@ -1269,10 +1268,9 @@ static void rp_set_termios(struct tty_struct *tty, struct termios *old_termios) static void send_break( struct r_port * info, int duration) { current->state = TASK_INTERRUPTIBLE; - current->timeout = jiffies + duration; cli(); sSendBreak(&info->channel); - schedule(); + schedule_timeout(duration); sClrBreak(&info->channel); sti(); } @@ -1666,8 +1664,7 @@ static void rp_wait_until_sent(struct tty_struct *tty, int timeout) #endif current->state = TASK_INTERRUPTIBLE; current->counter = 0; /* make us low-priority */ - current->timeout = jiffies + check_time; - schedule(); + schedule_timeout(check_time); if (signal_pending(current)) break; } |