diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 06:47:33 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 06:47:33 +0300 |
| commit | 11bfedff5594eef74617e6aa02986cf517526b98 (patch) | |
| tree | 2aa1a3b8d4e71abda7103b41edffb3a92ca26784 /drivers/dma/mpc512x_dma.c | |
| parent | 0a98f4b857e9aedf426d8b5b07699a8526e07530 (diff) | |
| parent | 793ae66c7dcc7e6655029f6613221a111b15b58e (diff) | |
| download | linux-11bfedff5594eef74617e6aa02986cf517526b98.tar.xz | |
Merge branch 'topic/err_reporting' into for-linus
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Conflicts:
drivers/dma/cppi41.c
Diffstat (limited to 'drivers/dma/mpc512x_dma.c')
| -rw-r--r-- | drivers/dma/mpc512x_dma.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c index 9dd99ba18fce..dde713461a95 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c @@ -411,8 +411,7 @@ static void mpc_dma_process_completed(struct mpc_dma *mdma) list_for_each_entry(mdesc, &list, node) { desc = &mdesc->desc; - if (desc->callback) - desc->callback(desc->callback_param); + dmaengine_desc_get_callback_invoke(desc, NULL); last_cookie = desc->cookie; dma_run_dependencies(desc); |