Merge branch 'topic/err_reporting' into for-linus

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

Conflicts:
	drivers/dma/cppi41.c
This commit is contained in:
Vinod Koul
2016-10-03 09:17:33 +05:30
41 changed files with 597 additions and 286 deletions

View File

@@ -517,11 +517,7 @@ static dma_cookie_t fsldma_run_tx_complete_actions(struct fsldma_chan *chan,
ret = txd->cookie;
/* Run the link descriptor callback function */
if (txd->callback) {
chan_dbg(chan, "LD %p callback\n", desc);
txd->callback(txd->callback_param);
}
dmaengine_desc_get_callback_invoke(txd, NULL);
dma_descriptor_unmap(txd);
}