From 9420eb875d286983a54efa218e085a860dd29523 Mon Sep 17 00:00:00 2001 From: Heikki Krogerus Date: Wed, 16 Jan 2013 14:08:14 +0200 Subject: [PATCH] --- yaml --- r: 354798 b: refs/heads/master c: a3b0397fdf19b3c23f37012532482c787e01d4a0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/8250/8250_dma.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 090ac2f7e1ed..21fde7a8ed51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f3fe3b1027bf50c0a0859e5c9ee93b174b95543 +refs/heads/master: a3b0397fdf19b3c23f37012532482c787e01d4a0 diff --git a/trunk/drivers/tty/serial/8250/8250_dma.c b/trunk/drivers/tty/serial/8250/8250_dma.c index 02333fc17f41..b9f7fd28112e 100644 --- a/trunk/drivers/tty/serial/8250/8250_dma.c +++ b/trunk/drivers/tty/serial/8250/8250_dma.c @@ -67,12 +67,12 @@ int serial8250_tx_dma(struct uart_8250_port *p) struct circ_buf *xmit = &p->port.state->xmit; struct dma_async_tx_descriptor *desc; - if (dma->tx_running) { - uart_write_wakeup(&p->port); + if (dma->tx_running) return -EBUSY; - } dma->tx_size = CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE); + if (!dma->tx_size) + return -EINVAL; desc = dmaengine_prep_slave_single(dma->txchan, dma->tx_addr + xmit->tail,