diff options
| author | Vinod Koul <[email protected]> | 2016-10-03 03:47:33 +0000 |
|---|---|---|
| committer | Vinod Koul <[email protected]> | 2016-10-03 03:47:33 +0000 |
| commit | 11bfedff5594eef74617e6aa02986cf517526b98 (patch) | |
| tree | 2aa1a3b8d4e71abda7103b41edffb3a92ca26784 /drivers/dma/cppi41.c | |
| parent | Merge branch 'topic/dmatest' into for-linus (diff) | |
| parent | dmaengine: qcom_hidma: add error reporting for tx_status (diff) | |
| download | kernel-11bfedff5594eef74617e6aa02986cf517526b98.tar.gz kernel-11bfedff5594eef74617e6aa02986cf517526b98.zip | |
Merge branch 'topic/err_reporting' into for-linus
Signed-off-by: Vinod Koul <[email protected]>
Conflicts:
drivers/dma/cppi41.c
Diffstat (limited to 'drivers/dma/cppi41.c')
| -rw-r--r-- | drivers/dma/cppi41.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c index 97f4d6c1b6b9..bac5f023013b 100644 --- a/drivers/dma/cppi41.c +++ b/drivers/dma/cppi41.c @@ -336,7 +336,7 @@ static irqreturn_t cppi41_irq(int irq, void *data) c->residue = pd_trans_len(c->desc->pd6) - len; dma_cookie_complete(&c->txd); - c->txd.callback(c->txd.callback_param); + dmaengine_desc_get_callback_invoke(&c->txd, NULL); /* Paired with cppi41_dma_issue_pending */ pm_runtime_mark_last_busy(cdd->ddev.dev); |