diff options
| author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2013-03-25 12:34:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 22:06:44 +0100 |
| commit | 6a3f45dccfa3db4de43aabc2f75a337e878f9b4b (patch) | |
| tree | c497b78d57055f325bc10bd0ef888dd6e3b4a23e /drivers/tty | |
| parent | Revert "USB: quatech2: only write to the tty if the port is open." (diff) | |
| download | linux-6a3f45dccfa3db4de43aabc2f75a337e878f9b4b.tar.xz linux-6a3f45dccfa3db4de43aabc2f75a337e878f9b4b.zip | |
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>
Diffstat (limited to 'drivers/tty')
| -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) 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; |