Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 454caf1b authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'fixes' into next

parents 2ccaef05 d4116052

drivers/dma/at_hdmac.c

+3 −1
Original line number Diff line number Diff line
@@ -245,6 +245,8 @@ atc_chain_complete(struct at_dma_chan *atchan, struct at_desc *desc) 
	dev_vdbg(chan2dev(&atchan->chan_common),

		"descriptor %u complete\n", txd->cookie);



	/* 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 */

drivers/dma/ep93xx_dma.c

+3 −1
Original line number Diff line number Diff line
@@ -703,6 +703,8 @@ static void ep93xx_dma_tasklet(unsigned long data) 
	desc = ep93xx_dma_get_active(edmac);

	if (desc) {

		if (desc->complete) {

			/* 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);

		}