diff options
author | Mark Brown <broonie@kernel.org> | 2014-08-31 08:46:19 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-08-31 08:46:19 -0400 |
commit | 2dbf5910442dfe3de239df7c01d6b83e72b8dbdd (patch) | |
tree | e08c5962cbc1ab6e0bbd59fdcfded9e4c37fed25 | |
parent | 29571ce4a3577ae0bff3909da7c1befef1d739db (diff) | |
parent | cdcd565fa0925edf9b80c875fcc84a231c75bd1d (diff) |
Merge remote-tracking branch 'spi/fix/sh-msiof' into spi-linus
-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); |