Merge remote-tracking branch 'tty/tty-next'

[karo-tx-linux.git] / drivers / tty / serial / 8250 / 8250_core.c

diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 2d4bd3929e507376f7d4b25f788fbba3b61af1a4..053c2007b0547018daf114499da5b67856d5c4ed 100644 (file)
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -1926,13 +1926,8 @@ static void serial8250_put_poll_char(struct uart_port *port,
        wait_for_xmitr(up, BOTH_EMPTY);
        /*
         *      Send the character out.
-        *      If a LF, also do CR...
         */
        serial_port_out(port, UART_TX, c);
-       if (c == 10) {
-               wait_for_xmitr(up, BOTH_EMPTY);
-               serial_port_out(port, UART_TX, 13);
-       }
 
        /*
         *      Finally, wait for transmitter to become empty