History

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

Mark Brown committed 12 years ago

Commit 2dbf5912 parents 29571ce cdcd5651 file · +2 −2Browse files

Unified · Split

drivers/spi/spi-sh-msiof.c+2−2
@@ -693,9 +693,9 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, · 692 unmodified lines
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);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t