Sorry about that. Diff should have handled that simple line offset. Now it applies cleanly to my linux-next atleast. Signed-off-by: Christian Melki <christian.melki@xxxxxxxxxxx> --- diff -urpN linux-next.orig/drivers/tty/serial/8250/8250.c linux-next/drivers/tty/serial/8250/8250.c --- linux-next.orig/drivers/tty/serial/8250/8250.c 2012-04-30 10:58:13.000000000 +0200 +++ linux-next/drivers/tty/serial/8250/8250.c 2012-04-30 11:03:12.000000000 +0200 @@ -2259,10 +2259,11 @@ serial8250_do_set_termios(struct uart_po quot++; if (up->capabilities & UART_CAP_FIFO && port->fifosize > 1) { - if (baud < 2400) - fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1; - else - fcr = uart_config[port->type].fcr; + fcr = uart_config[port->type].fcr; + if (baud < 2400) { + fcr &= ~UART_FCR_TRIGGER_MASK; + fcr |= UART_FCR_TRIGGER_1; + } } /* -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html