diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-17 09:57:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-17 09:57:13 -0700 |
commit | 1be5f0b7575e090fd100a98b303860879b5800de (patch) | |
tree | 039e46bc92b93e68dbb9645413d5fd5007a411d6 /drivers/dma/pl330.c | |
parent | 42e8b9c00176dd3a2f11d05f195131bac851558b (diff) | |
parent | d41160524d8d8ee721296e5c7e15f1ed727df7eb (diff) |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes fromVinod Koul:
"fixes of cylic dma usages in slave dma drivers"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: fix cyclic dma usage
dmaengine: pl330: dont complete descriptor for cyclic dma
Diffstat (limited to 'drivers/dma/pl330.c')
-rw-r--r-- | drivers/dma/pl330.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 2ee6e23930a..fa3fb21e60b 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2322,7 +2322,8 @@ static void pl330_tasklet(unsigned long data) /* Pick up ripe tomatoes */ list_for_each_entry_safe(desc, _dt, &pch->work_list, node) if (desc->status == DONE) { - dma_cookie_complete(&desc->txd); + if (pch->cyclic) + dma_cookie_complete(&desc->txd); list_move_tail(&desc->node, &list); } |