Commit 4092dc8f0bcc0963c045460157107d7461a094d7
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul: "Two small fixes for omap dmaengine driver which fixes cyclic suspend and resume" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: omap-dma: Restore the CLINK_CTRL in resume path dmaengine: omap-dma: Add memory barrier to dma_resume path
Showing 1 changed file Side-by-side Diff
drivers/dma/omap-dma.c
| ... | ... | @@ -1017,6 +1017,11 @@ |
| 1017 | 1017 | return -EINVAL; |
| 1018 | 1018 | |
| 1019 | 1019 | if (c->paused) { |
| 1020 | + mb(); | |
| 1021 | + | |
| 1022 | + /* Restore channel link register */ | |
| 1023 | + omap_dma_chan_write(c, CLNK_CTRL, c->desc->clnk_ctrl); | |
| 1024 | + | |
| 1020 | 1025 | omap_dma_start(c, c->desc); |
| 1021 | 1026 | c->paused = false; |
| 1022 | 1027 | } |