aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/serial_core.c
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2014-10-16 16:54:23 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-05 18:53:55 -0800
commit74866e7593d9824d527e73f548c4fb8e412588a1 (patch)
tree5b5a011953fc9bdb4f9668c0d7f872c378e3d8f8 /drivers/tty/serial/serial_core.c
parenttty: Document defunct ASYNC_* bits in uapi header (diff)
downloadlinux-dev-74866e7593d9824d527e73f548c4fb8e412588a1.tar.xz
linux-dev-74866e7593d9824d527e73f548c4fb8e412588a1.zip
serial: core: Unwrap >80 char line in uart_close()
The wrapped line looks wrong and out-of-place; leave it as >80 char line. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/serial_core.c')
-rw-r--r--drivers/tty/serial/serial_core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index e31d56159aee..67b2c355d32f 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1374,8 +1374,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
if (port->blocked_open) {
spin_unlock_irqrestore(&port->lock, flags);
if (port->close_delay)
- msleep_interruptible(
- jiffies_to_msecs(port->close_delay));
+ msleep_interruptible(jiffies_to_msecs(port->close_delay));
spin_lock_irqsave(&port->lock, flags);
} else if (!uart_console(uport)) {
spin_unlock_irqrestore(&port->lock, flags);