summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2016-01-11 05:36:14 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-01-28 23:13:44 +0100
commit5823323ea5ed41ea08ef0a36013369d0c65a23de (patch)
tree17f89f2afaea04017e8cd24a8166727b3bef5873
parenttty: Unify receive_buf() code paths (diff)
downloadlinux-5823323ea5ed41ea08ef0a36013369d0c65a23de.tar.xz
linux-5823323ea5ed41ea08ef0a36013369d0c65a23de.zip
tty: Allow unreadable mess to be > 80 chars
Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/tty_port.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index 846ed481c24f..a76aec2ca480 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
@@ -510,10 +510,8 @@ void tty_port_close_end(struct tty_port *port, struct tty_struct *tty)
if (port->blocked_open) {
spin_unlock_irqrestore(&port->lock, flags);
- if (port->close_delay) {
- msleep_interruptible(
- jiffies_to_msecs(port->close_delay));
- }
+ if (port->close_delay)
+ msleep_interruptible(jiffies_to_msecs(port->close_delay));
spin_lock_irqsave(&port->lock, flags);
wake_up_interruptible(&port->open_wait);
}