diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-18 23:08:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-18 23:08:58 +0200 |
| commit | 02730d3c053a9af1d402e1c8dc8bbbc5a1340406 (patch) | |
| tree | db289a08de50eb4b5caf7840d5b7356ddfa1c51f /drivers/tty/serial/amba-pl011.c | |
| parent | vt: Don't check KD_GRAPHICS when binding/unbinding (diff) | |
| parent | Linux 4.1-rc4 (diff) | |
| download | linux-02730d3c053a9af1d402e1c8dc8bbbc5a1340406.tar.xz linux-02730d3c053a9af1d402e1c8dc8bbbc5a1340406.zip | |
Merge 4.1-rc4 into tty-next
This resolves some tty driver merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/amba-pl011.c')
| -rw-r--r-- | drivers/tty/serial/amba-pl011.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index f5bd8426fd75..6fabc059efed 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1578,6 +1578,9 @@ static int pl011_startup(struct uart_port *port) writew(uap->vendor->ifls, uap->port.membase + UART011_IFLS); + /* Assume that TX IRQ doesn't work until we see one: */ + uap->tx_irq_seen = 0; + spin_lock_irq(&uap->port.lock); /* restore RTS and DTR */ |