diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 11:34:07 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 11:34:07 -0700 |
| commit | 9d93551188069a0a21e664b4bfc89ed4a6df1903 (patch) | |
| tree | bcf7334c0e57323a6844b8147ce1c92180fe8cef /drivers/dma/omap-dma.c | |
| parent | dd4cae8bf16611053ee7b00e20aa4fa945b92b99 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
| download | blackbird-op-linux-9d93551188069a0a21e664b4bfc89ed4a6df1903.tar.gz blackbird-op-linux-9d93551188069a0a21e664b4bfc89ed4a6df1903.zip | |
Merge tag 'v3.17' into next
Synchronize with mainline to bring in changes to Synaptics and i8042
drivers.
Diffstat (limited to 'drivers/dma/omap-dma.c')
| -rw-r--r-- | drivers/dma/omap-dma.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index 4cf7d9a950d7..bbea8243f9e8 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -1017,6 +1017,11 @@ static int omap_dma_resume(struct omap_chan *c) return -EINVAL; if (c->paused) { + mb(); + + /* Restore channel link register */ + omap_dma_chan_write(c, CLNK_CTRL, c->desc->clnk_ctrl); + omap_dma_start(c, c->desc); c->paused = false; } |
