From: Heikki Krogerus Date: Mon, 25 Mar 2013 11:34:44 +0000 (+0200) Subject: serial: 8250: Allow probe drivers to ignore tx_loadsz X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6a3f45dccfa3db4de43aabc2f75a337e878f9b4b;p=linux-beck.git serial: 8250: Allow probe drivers to ignore tx_loadsz In most cases the tx_loadsz is the same as fifosize. This will store the fifosize in it if it was not separately delivered from the driver. Signed-off-by: Heikki Krogerus Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c index cf6a5383748a..19ebbdf43106 100644 --- 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;