aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/serial_core.c
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2014-09-02 17:39:11 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-08 16:21:35 -0700
commit99abf3b9242fbc5fec586223a5068544e0e9d90f (patch)
tree28ad02dbd05948ca7e4db9a0fc694007cd7152f4 /drivers/tty/serial/serial_core.c
parentRevert "serial: uart: add hw flow control support configuration" (diff)
downloadlinux-dev-99abf3b9242fbc5fec586223a5068544e0e9d90f.tar.xz
linux-dev-99abf3b9242fbc5fec586223a5068544e0e9d90f.zip
serial: Style fix
Unwrap if() conditional; no functional change. 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 2e57d5b6347d..0742f77ac410 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1288,8 +1288,7 @@ static void uart_set_termios(struct tty_struct *tty,
/* Handle transition away from B0 status */
else if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {
unsigned int mask = TIOCM_DTR;
- if (!(cflag & CRTSCTS) ||
- !test_bit(TTY_THROTTLED, &tty->flags))
+ if (!(cflag & CRTSCTS) || !test_bit(TTY_THROTTLED, &tty->flags))
mask |= TIOCM_RTS;
uart_set_mctrl(uport, mask);
}