Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b280a97d authored by Nick Pelly's avatar Nick Pelly Committed by Greg Kroah-Hartman
Browse files

omap-serial: Allow IXON and IXOFF to be disabled. 



Fixes logic bug that software flow control cannot be disabled, because
serial_omap_configure_xonxoff() is not called if both IXON and IXOFF bits
are cleared.

Signed-off-by: default avatarNick Pelly <npelly@google.com>
Acked-by: default avatarGovindraj.R <govindraj.raja@ti.com>
Tested-by: default avatarGovindraj.R <govindraj.raja@ti.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0055197e

drivers/tty/serial/omap-serial.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -806,7 +806,6 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, 




	serial_omap_set_mctrl(&up->port, up->port.mctrl);

	serial_omap_set_mctrl(&up->port, up->port.mctrl);

	/* Software Flow Control Configuration */

	/* Software Flow Control Configuration */

	if (termios->c_iflag & (IXON | IXOFF))

	serial_omap_configure_xonxoff(up, termios);

	serial_omap_configure_xonxoff(up, termios);





	spin_unlock_irqrestore(&up->port.lock, flags);

	spin_unlock_irqrestore(&up->port.lock, flags);