diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-11 10:11:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-11 10:11:29 -0700 |
| commit | 1497e84a49dcfa36e478dbab8ad2212ebee9ba59 (patch) | |
| tree | 97e67c4a2cb8df5b7219c70976ef266586345970 /drivers | |
| parent | Merge tag 'pinctrl-v3.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl (diff) | |
| parent | dmaengine: jz4740: Fix non-cyclic descriptor completion (diff) | |
| download | linux-dev-1497e84a49dcfa36e478dbab8ad2212ebee9ba59.tar.xz linux-dev-1497e84a49dcfa36e478dbab8ad2212ebee9ba59.zip | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
"Two minor fixes.
First one from Kuninori clarifying dmas bindings and second from Lars
for fixing dma descriptor completion in non cyclic case"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: jz4740: Fix non-cyclic descriptor completion
dt/bindings: rcar-audmapp: tidyup dmas explanation
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/dma-jz4740.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/dma-jz4740.c b/drivers/dma/dma-jz4740.c index 6a9d89c93b1f..ae2ab14e64b3 100644 --- a/drivers/dma/dma-jz4740.c +++ b/drivers/dma/dma-jz4740.c @@ -362,8 +362,9 @@ static void jz4740_dma_chan_irq(struct jz4740_dmaengine_chan *chan) vchan_cyclic_callback(&chan->desc->vdesc); } else { if (chan->next_sg == chan->desc->num_sgs) { - chan->desc = NULL; + list_del(&chan->desc->vdesc.node); vchan_cookie_complete(&chan->desc->vdesc); + chan->desc = NULL; } } } |