diff options
| author |   Peter Hurley <peter@hurleysoftware.com> | 2013-06-15 07:28:29 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 12:55:19 -0700 |
| commit | a6e54319a7499bf754efb3a2cb2f5d4901ccbcff (patch) | |
| tree | 0e47a950b25436ff3666fdf44b599a65150219ad /drivers/tty | |
| parent | n_tty: Encapsulate minimum_to_wake within N_TTY (diff) | |
| download | linux-dev-a6e54319a7499bf754efb3a2cb2f5d4901ccbcff.tar.xz linux-dev-a6e54319a7499bf754efb3a2cb2f5d4901ccbcff.zip | |
n_tty: Untangle read completion variables
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/n_tty.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index f1806de69b18..fa5cb4654c4f 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -1801,20 +1801,16 @@ do_it_again: minimum = time = 0; timeout = MAX_SCHEDULE_TIMEOUT; if (!ldata->icanon) { - time = (HZ / 10) * TIME_CHAR(tty); minimum = MIN_CHAR(tty); if (minimum) { + time = (HZ / 10) * TIME_CHAR(tty); if (time) ldata->minimum_to_wake = 1; else if (!waitqueue_active(&tty->read_wait) || (ldata->minimum_to_wake > minimum)) ldata->minimum_to_wake = minimum; } else { - timeout = 0; - if (time) { - timeout = time; - time = 0; - } + timeout = (HZ / 10) * TIME_CHAR(tty); ldata->minimum_to_wake = minimum = 1; } } |