summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-08-16 16:34:35 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-08-16 16:34:34 -0700
commit7998a3bdd8f68c4631eab191e1ca9072aa9985ca (patch)
tree0f69f28c3ec25c07f43337fa610a090e9f19d737
parent11b1a53f3844d50b22884d45215c3a718d265b7a (diff)
parent965faeecbb68c38599c7914b5fc38b72e8734bb3 (diff)
Merge "tty: serial: msm: Don't read off end of tx fifo"
-rw-r--r--drivers/tty/serial/msm_serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index a442270ee0c7..7df1365a7458 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -891,7 +891,7 @@ static void msm_handle_tx(struct uart_port *port)
return;
}
- pio_count = CIRC_CNT(xmit->head, xmit->tail, UART_XMIT_SIZE);
+ pio_count = CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE);
dma_count = CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE);
dma_min = 1; /* Always DMA */