Commit 12fe59f9 authored Mar 10, 2015 by Fabio Estevam Committed by Greg Kroah-Hartman Mar 11, 2015

serial: imx: Add braces to avoid ambiguous 'else'

Commit 17b8f2a3 ("serial: imx: add support for half duplex rs485")
introduced the following build warning:

drivers/tty/serial/imx.c: In function 'imx_set_termios':
drivers/tty/serial/imx.c:1301:7: warning: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]

Add the suggested braces to avoid the build warning.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 13bc2bb9

drivers/tty/serial/imx.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1298,7 +1298,7 @@ imx_set_termios(struct uart_port port, struct ktermios termios,
		if (sport->have_rtscts) {
		ucr2 &= ~UCR2_IRTS;

		if (port->rs485.flags & SER_RS485_ENABLED)
		if (port->rs485.flags & SER_RS485_ENABLED) {
		/*
		* RTS is mandatory for rs485 operation, so keep
		* it under manual control and keep transmitter
		@@ -1307,9 +1307,9 @@ imx_set_termios(struct uart_port port, struct ktermios termios,
		if (!(port->rs485.flags &
		SER_RS485_RTS_AFTER_SEND))
		ucr2 \|= UCR2_CTS;
		else
		} else {
		ucr2 \|= UCR2_CTSC;

		}
		} else {
		termios->c_cflag &= ~CRTSCTS;
		}