diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 15:52:12 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 15:52:12 -0700 |
| commit | ca17749259d26f7ddbb0678790d5d534018d0a6b (patch) | |
| tree | 730e0bd336e78d673760df2b4116277af1c8c495 /drivers/tty/serial/arc_uart.c | |
| parent | drivers: tty: Fix use-after-free in pty_common_install (diff) | |
| parent | Linux 3.16-rc5 (diff) | |
| download | linux-dev-ca17749259d26f7ddbb0678790d5d534018d0a6b.tar.xz linux-dev-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/arc_uart.c')
| -rw-r--r-- | drivers/tty/serial/arc_uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c index f8dc7d381956..a59d1d77e750 100644 --- a/drivers/tty/serial/arc_uart.c +++ b/drivers/tty/serial/arc_uart.c @@ -171,7 +171,7 @@ static void arc_serial_tx_chars(struct uart_port *port) port->icount.tx++; port->x_char = 0; sent = 1; - } else if (xmit->tail != xmit->head) { /* TODO: uart_circ_empty */ + } else if (!uart_circ_empty(xmit)) { ch = xmit->buf[xmit->tail]; xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); port->icount.tx++; |