diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2012-05-15 08:44:54 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-05-15 08:44:54 +0530 |
| commit | 454caf1bef18698d62f3b6d99df0344cb10de841 (patch) | |
| tree | b2dacda4144a0b27914a62eb169fd0fb5425c698 | |
| parent | 2ccaef0520d18d0072153f090d4110b4075c332c (diff) | |
| parent | d41160524d8d8ee721296e5c7e15f1ed727df7eb (diff) | |
| download | kernel_goldelico_gta04-454caf1bef18698d62f3b6d99df0344cb10de841.zip kernel_goldelico_gta04-454caf1bef18698d62f3b6d99df0344cb10de841.tar.gz kernel_goldelico_gta04-454caf1bef18698d62f3b6d99df0344cb10de841.tar.bz2 | |
Merge branch 'fixes' into next
| -rw-r--r-- | drivers/dma/at_hdmac.c | 4 | ||||
| -rw-r--r-- | drivers/dma/ep93xx_dma.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index 445fdf8..bf0d7e4 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c @@ -245,7 +245,9 @@ atc_chain_complete(struct at_dma_chan *atchan, struct at_desc *desc) dev_vdbg(chan2dev(&atchan->chan_common), "descriptor %u complete\n", txd->cookie); - dma_cookie_complete(txd); + /* mark the descriptor as complete for non cyclic cases only */ + if (!atc_chan_is_cyclic(atchan)) + dma_cookie_complete(txd); /* move children to free_list */ list_splice_init(&desc->tx_list, &atchan->free_list); diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c index e6f133b..f6e9b57 100644 --- a/drivers/dma/ep93xx_dma.c +++ b/drivers/dma/ep93xx_dma.c @@ -703,7 +703,9 @@ static void ep93xx_dma_tasklet(unsigned long data) desc = ep93xx_dma_get_active(edmac); if (desc) { if (desc->complete) { - dma_cookie_complete(&desc->txd); + /* mark descriptor complete for non cyclic case only */ + if (!test_bit(EP93XX_DMA_IS_CYCLIC, &edmac->flags)) + dma_cookie_complete(&desc->txd); list_splice_init(&edmac->active, &list); } callback = desc->txd.callback; |