diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-14 18:08:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-14 18:08:51 +0000 |
| commit | 9084a3155c68ca1e519fc12630cb15c03d3ce8fa (patch) | |
| tree | ab632fa3ab22afe126957ae575bdd650e35bca9c /drivers/tty | |
| parent | 2c145acb1c23e5b6f8f9f8a9fa43d3a2a69f7f7c (diff) | |
| parent | 8eb52971d4749c0192358e1942ca83d8dc7e686b (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rt
Conflicts:
net/ipv4/ip_output.c
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 2 | ||||
| -rw-r--r-- | drivers/tty/tty_io.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 0f1cc2c8c22a..1fabb22ae615 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -359,7 +359,7 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios, * The spd_hi, spd_vhi, spd_shi, spd_warp kludge... * Die! Die! Die! */ - if (baud == 38400) + if (try == 0 && baud == 38400) baud = altbaud; /* diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 3723c0ebb316..d35afccdb6c9 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -1698,6 +1698,7 @@ int tty_release(struct inode *inode, struct file *filp) int pty_master, tty_closing, o_tty_closing, do_sleep; int idx; char buf[64]; + long timeout = 0; if (tty_paranoia_check(tty, inode, __func__)) return 0; @@ -1782,7 +1783,11 @@ int tty_release(struct inode *inode, struct file *filp) __func__, tty_name(tty, buf)); tty_unlock_pair(tty, o_tty); mutex_unlock(&tty_mutex); - schedule(); + schedule_timeout_killable(timeout); + if (timeout < 120 * HZ) + timeout = 2 * timeout + 1; + else + timeout = MAX_SCHEDULE_TIMEOUT; } /* |