diff options
| author | Mark Brown <broonie@kernel.org> | 2021-06-25 14:08:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-06-25 14:08:26 +0100 |
| commit | 1bee1ecf232cd90ad112d78ab5124850b4e5ea09 (patch) | |
| tree | 850cf42ea49ec040c2042fdd8bc61d332461e948 /drivers/spi/spi-rspi.c | |
| parent | edf978a5a17dc9e38625b33821dc71f10c46f694 (diff) | |
| parent | b470e10eb43f19e08245cd87dd3192a8141cfbb5 (diff) | |
Merge remote-tracking branch 'spi/for-5.14' into spi-next
Diffstat (limited to 'drivers/spi/spi-rspi.c')
| -rw-r--r-- | drivers/spi/spi-rspi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index e39fd38f5180..d16ed88802d3 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -618,9 +618,9 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx, ret = -ETIMEDOUT; } if (tx) - dmaengine_terminate_all(rspi->ctlr->dma_tx); + dmaengine_terminate_sync(rspi->ctlr->dma_tx); if (rx) - dmaengine_terminate_all(rspi->ctlr->dma_rx); + dmaengine_terminate_sync(rspi->ctlr->dma_rx); } rspi_disable_irq(rspi, irq_mask); @@ -634,7 +634,7 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx, no_dma_tx: if (rx) - dmaengine_terminate_all(rspi->ctlr->dma_rx); + dmaengine_terminate_sync(rspi->ctlr->dma_rx); no_dma_rx: if (ret == -EAGAIN) { dev_warn_once(&rspi->ctlr->dev, |