serial: 8250: Allow probe drivers to ignore tx_loadsz

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

diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
index cf6a5383748aa6cf468a76e72e1c575497031eed..19ebbdf4310637c8d75ba5ca53862563552e47b7 100644 (file)
--- a/drivers/tty/serial/8250/8250.c
+++ b/drivers/tty/serial/8250/8250.c
@@ -3247,6 +3247,10 @@ int serial8250_register_8250_port(struct uart_8250_port *up)
                uart->tx_loadsz         = up->tx_loadsz;
                uart->capabilities      = up->capabilities;
 
+               /* Take tx_loadsz from fifosize if it wasn't set separately */
+               if (uart->port.fifosize && !uart->tx_loadsz)
+                       uart->tx_loadsz = uart->port.fifosize;
+
                if (up->port.dev)
                        uart->port.dev = up->port.dev;