serial: bfin_uart: Don't switch baud rate untill the transfer buffer is empty.

[firefly-linux-kernel-4.4.55.git] / drivers / tty / serial / bfin_uart.c

diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index ca64c4a83ce05ff05dc34d9d512a48f992d397fc..e6a008f4939f47ac6aac0129ef0f1cf5b90c3998 100644 (file)
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -799,6 +799,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
        unsigned long flags;
        unsigned int baud, quot;
        unsigned int ier, lcr = 0;
+       unsigned long timeout;
 
        switch (termios->c_cflag & CSIZE) {
        case CS8:
@@ -868,6 +869,14 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
 
        UART_SET_ANOMALY_THRESHOLD(uart, USEC_PER_SEC / baud * 15);
 
+       /* Wait till the transfer buffer is empty */
+       timeout = jiffies + msecs_to_jiffies(10);
+       while (UART_GET_GCTL(uart) & UCEN && !(UART_GET_LSR(uart) & TEMT))
+               if (time_after(jiffies, timeout)) {
+                       dev_warn(port->dev, "timeout waiting for TX buffer empty\n");
+                       break;
+               }
+
        /* Disable UART */
        ier = UART_GET_IER(uart);
        UART_PUT_GCTL(uart, UART_GET_GCTL(uart) & ~UCEN);
@@ -1389,7 +1398,7 @@ out_error_free_mem:
        return ret;
 }
 
-static int __devexit bfin_serial_remove(struct platform_device *pdev)
+static int bfin_serial_remove(struct platform_device *pdev)
 {
        struct bfin_serial_port *uart = platform_get_drvdata(pdev);
 
@@ -1409,7 +1418,7 @@ static int __devexit bfin_serial_remove(struct platform_device *pdev)
 
 static struct platform_driver bfin_serial_driver = {
        .probe          = bfin_serial_probe,
-       .remove         = __devexit_p(bfin_serial_remove),
+       .remove         = bfin_serial_remove,
        .suspend        = bfin_serial_suspend,
        .resume         = bfin_serial_resume,
        .driver         = {