diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-14 00:52:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-14 00:52:12 +0200 |
| commit | ca17749259d26f7ddbb0678790d5d534018d0a6b (patch) | |
| tree | 730e0bd336e78d673760df2b4116277af1c8c495 /drivers/tty/serial/sunsab.c | |
| parent | drivers: tty: Fix use-after-free in pty_common_install (diff) | |
| parent | Linux 3.16-rc5 (diff) | |
| download | linux-ca17749259d26f7ddbb0678790d5d534018d0a6b.tar.xz linux-ca17749259d26f7ddbb0678790d5d534018d0a6b.zip | |
Merge 3.16-rc5 into tty-next.
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/sunsab.c')
| -rw-r--r-- | drivers/tty/serial/sunsab.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c index c9751d8b24c1..bb09920ac9c7 100644 --- a/drivers/tty/serial/sunsab.c +++ b/drivers/tty/serial/sunsab.c @@ -427,6 +427,9 @@ static void sunsab_start_tx(struct uart_port *port) struct circ_buf *xmit = &up->port.state->xmit; int i; + if (uart_circ_empty(xmit)) + return; + up->interrupt_mask1 &= ~(SAB82532_IMR1_ALLS|SAB82532_IMR1_XPR); writeb(up->interrupt_mask1, &up->regs->w.imr1); |