diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2012-05-11 02:24:34 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-05-11 02:24:34 -0400 |
| commit | 0d68ad197b1a4c93b9991faafa23df6d496f7c67 (patch) | |
| tree | cc77a1efbacd9fb6ecdaeebc5b464de9e84cebb4 /drivers/dma | |
| parent | abd9ccc84c35cf1e296335a7b655bba40c92386c (diff) | |
| parent | eab21585580344c8533d5e7bc4edea27ad1e268f (diff) | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/dma')
| -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 2ee6e23930ad..fa3fb21e60be 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c | |||
| @@ -2322,7 +2322,8 @@ static void pl330_tasklet(unsigned long data) | |||
| 2322 | /* Pick up ripe tomatoes */ | 2322 | /* Pick up ripe tomatoes */ |
| 2323 | list_for_each_entry_safe(desc, _dt, &pch->work_list, node) | 2323 | list_for_each_entry_safe(desc, _dt, &pch->work_list, node) |
| 2324 | if (desc->status == DONE) { | 2324 | if (desc->status == DONE) { |
| 2325 | dma_cookie_complete(&desc->txd); | 2325 | if (pch->cyclic) |
| 2326 | dma_cookie_complete(&desc->txd); | ||
| 2326 | list_move_tail(&desc->node, &list); | 2327 | list_move_tail(&desc->node, &list); |
| 2327 | } | 2328 | } |
| 2328 | 2329 | ||