diff options
| author | Mark Brown <broonie@kernel.org> | 2014-08-31 13:46:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-08-31 13:46:19 +0100 |
| commit | 2dbf5910442dfe3de239df7c01d6b83e72b8dbdd (patch) | |
| tree | e08c5962cbc1ab6e0bbd59fdcfded9e4c37fed25 /drivers/spi | |
| parent | 29571ce4a3577ae0bff3909da7c1befef1d739db (diff) | |
| parent | cdcd565fa0925edf9b80c875fcc84a231c75bd1d (diff) | |
| download | op-kernel-dev-2dbf5910442dfe3de239df7c01d6b83e72b8dbdd.zip op-kernel-dev-2dbf5910442dfe3de239df7c01d6b83e72b8dbdd.tar.gz | |
Merge remote-tracking branch 'spi/fix/sh-msiof' into spi-linus
Diffstat (limited to 'drivers/spi')
| -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 887c208..543075b 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); |
