---

yaml --- r: 354798 b: refs/heads/master c: a3b0397 h: refs/heads/master v: v3
git-mirror · Jan 16, 2013 · 9420eb8 · 9420eb8
1 parent 2e84239
commit 9420eb8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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,