Skip to content

Commit 72ea1c6

Browse files
author
Lee Jones
committed
Revert "serial: pl011: Fix DMA ->flush_buffer()"
This reverts commit 8764ed5 which is commit f6a1964 upstream. It's being reverted becuase it causes build errors: drivers/tty/serial/amba-pl011.c:687:2: error: implicit declaration of function ‘dmaengine_terminate_async’; did you mean ‘dmaengine_terminate_all’? [-Werror=implicit-function-declaration] Change-Id: I968b66a26997009690fb1f478e225384412f0c01 Signed-off-by: Lee Jones <lee.jones@linaro.org>
1 parent eb46485 commit 72ea1c6

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/tty/serial/amba-pl011.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -684,8 +684,10 @@ __acquires(&uap->port.lock)
684684
if (!uap->using_tx_dma)
685685
return;
686686

687-
dmaengine_terminate_async(uap->dmatx.chan);
688-
687+
/* Avoid deadlock with the DMA engine callback */
688+
spin_unlock(&uap->port.lock);
689+
dmaengine_terminate_all(uap->dmatx.chan);
690+
spin_lock(&uap->port.lock);
689691
if (uap->dmatx.queued) {
690692
dma_unmap_sg(uap->dmatx.chan->device->dev, &uap->dmatx.sg, 1,
691693
DMA_TO_DEVICE);

0 commit comments

Comments
 (0)