aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-08-07 08:07:43 -0400
committerMark Brown <broonie@linaro.org>2014-08-16 18:14:30 -0400
commit7a9f957b395fc08edc47620c01e8bb5b798caddb (patch)
tree338e9290ea716ec65b77fabd978c2fcc4f502ec1
parenta5e7c719fe257214aeda3dadb502a4cf58209a61 (diff)
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 daaa868e959f..1165d418340f 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -689,9 +689,9 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx,
689 reinit_completion(&p->done); 689 reinit_completion(&p->done);
690 690
691 /* Now start DMA */ 691 /* Now start DMA */
692 if (tx)
693 dma_async_issue_pending(p->master->dma_rx);
694 if (rx) 692 if (rx)
693 dma_async_issue_pending(p->master->dma_rx);
694 if (tx)
695 dma_async_issue_pending(p->master->dma_tx); 695 dma_async_issue_pending(p->master->dma_tx);
696 696
697 ret = sh_msiof_spi_start(p, rx); 697 ret = sh_msiof_spi_start(p, rx);