Skip to content

Commit

Permalink
Merge remote-tracking branch 'spi/fix/sh-msiof' into spi-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Aug 31, 2014
2 parents 29571ce + cdcd565 commit 2dbf591
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/spi/spi-sh-msiof.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 2dbf591

Please sign in to comment.