diff options
author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-10 23:36:14 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-28 17:13:44 -0500 |
commit | 5823323ea5ed41ea08ef0a36013369d0c65a23de (patch) | |
tree | 17f89f2afaea04017e8cd24a8166727b3bef5873 /drivers/tty/tty_port.c | |
parent | 8d082cd300ab422b7ee9f4629a1c470e4f0d90d5 (diff) |
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>
Diffstat (limited to 'drivers/tty/tty_port.c')
-rw-r--r-- | drivers/tty/tty_port.c | 6 |
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) | |||
510 | 510 | ||
511 | if (port->blocked_open) { | 511 | if (port->blocked_open) { |
512 | spin_unlock_irqrestore(&port->lock, flags); | 512 | spin_unlock_irqrestore(&port->lock, flags); |
513 | if (port->close_delay) { | 513 | if (port->close_delay) |
514 | msleep_interruptible( | 514 | msleep_interruptible(jiffies_to_msecs(port->close_delay)); |
515 | jiffies_to_msecs(port->close_delay)); | ||
516 | } | ||
517 | spin_lock_irqsave(&port->lock, flags); | 515 | spin_lock_irqsave(&port->lock, flags); |
518 | wake_up_interruptible(&port->open_wait); | 516 | wake_up_interruptible(&port->open_wait); |
519 | } | 517 | } |