diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-08-07 08:07:43 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-08-31 08:41:46 -0400 |
commit | cdcd565fa0925edf9b80c875fcc84a231c75bd1d (patch) | |
tree | ae8ce72c0e2f7a4bba88850c471fbb3dc04b1423 | |
parent | 3e81b59208fa4697c6c3b6eefb92892b47f8b1e7 (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.c | 4 |
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, | |||
693 | reinit_completion(&p->done); | 693 | reinit_completion(&p->done); |
694 | 694 | ||
695 | /* Now start DMA */ | 695 | /* Now start DMA */ |
696 | if (tx) | ||
697 | dma_async_issue_pending(p->master->dma_rx); | ||
698 | if (rx) | 696 | if (rx) |
697 | dma_async_issue_pending(p->master->dma_rx); | ||
698 | if (tx) | ||
699 | dma_async_issue_pending(p->master->dma_tx); | 699 | dma_async_issue_pending(p->master->dma_tx); |
700 | 700 | ||
701 | ret = sh_msiof_spi_start(p, rx); | 701 | ret = sh_msiof_spi_start(p, rx); |