aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-08-07 14:07:43 +0200
committerMark Brown <broonie@kernel.org>2014-08-31 13:41:46 +0100
commitcdcd565fa0925edf9b80c875fcc84a231c75bd1d (patch)
treeae8ce72c0e2f7a4bba88850c471fbb3dc04b1423
parent3e81b59208fa4697c6c3b6eefb92892b47f8b1e7 (diff)
downloadlinux-stericsson-cdcd565fa0925edf9b80c875fcc84a231c75bd1d.tar.gz
spi: sh-msiof: Fix transmit-only DMA transfers
Fix tx/rx mixup, which broke transmit-only transfers. Introduced by commit 4240305f7cbdc7782aa8bc40cc702775d9ac0839 ("spi: sh-msiof: Fix leaking of unused DMA descriptors"). Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/spi/spi-sh-msiof.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 887c2084130f..543075b80f16 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -693,9 +693,9 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx,
reinit_completion(&p->done);
/* Now start DMA */
- if (tx)
- dma_async_issue_pending(p->master->dma_rx);
if (rx)
+ dma_async_issue_pending(p->master->dma_rx);
+ if (tx)
dma_async_issue_pending(p->master->dma_tx);
ret = sh_msiof_spi_start(p, rx);