diff options
author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2013-03-25 07:34:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 17:06:44 -0400 |
commit | 6a3f45dccfa3db4de43aabc2f75a337e878f9b4b (patch) | |
tree | c497b78d57055f325bc10bd0ef888dd6e3b4a23e | |
parent | 2be818a116b22dff518f0d7112e6bed39f2034a1 (diff) |
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 <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/8250/8250.c | 4 |
1 files changed, 4 insertions, 0 deletions
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) | |||
3247 | uart->tx_loadsz = up->tx_loadsz; | 3247 | uart->tx_loadsz = up->tx_loadsz; |
3248 | uart->capabilities = up->capabilities; | 3248 | uart->capabilities = up->capabilities; |
3249 | 3249 | ||
3250 | /* Take tx_loadsz from fifosize if it wasn't set separately */ | ||
3251 | if (uart->port.fifosize && !uart->tx_loadsz) | ||
3252 | uart->tx_loadsz = uart->port.fifosize; | ||
3253 | |||
3250 | if (up->port.dev) | 3254 | if (up->port.dev) |
3251 | uart->port.dev = up->port.dev; | 3255 | uart->port.dev = up->port.dev; |
3252 | 3256 | ||