Merge remote-tracking branch 'spi/fix/sh-msiof' into spi-linus

2dbf5910 · Mark Brown · 29571ce4 · cdcd565f · 2dbf5910
Commit 2dbf5910 authored Aug 31, 2014 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/spi/spi-sh-msiof.c drivers/spi/spi-sh-msiof.c +2 -2

No files found.
--- 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);