From 12fe59f975b9b36a17eced4c4d33911ee9bc9f7a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 10 Mar 2015 12:46:29 -0300 Subject: [PATCH] serial: imx: Add braces to avoid ambiguous 'else' MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit 17b8f2a3fdca29 ("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 Acked-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/imx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index ddfb672d0152..c8cfa0637128 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -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; } -- 2.39.5