diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:17:33 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:17:33 +0530 |
| commit | 11bfedff5594eef74617e6aa02986cf517526b98 (patch) | |
| tree | 2aa1a3b8d4e71abda7103b41edffb3a92ca26784 /drivers/dma/ppc4xx | |
| parent | 0a98f4b857e9aedf426d8b5b07699a8526e07530 (diff) | |
| parent | 793ae66c7dcc7e6655029f6613221a111b15b58e (diff) | |
| download | linux-11bfedff5594eef74617e6aa02986cf517526b98.tar.gz linux-11bfedff5594eef74617e6aa02986cf517526b98.tar.bz2 linux-11bfedff5594eef74617e6aa02986cf517526b98.zip | |
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/ppc4xx')
| -rw-r--r-- | drivers/dma/ppc4xx/adma.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c index 66bd96724b2f..d45da34a0568 100644 --- a/drivers/dma/ppc4xx/adma.c +++ b/drivers/dma/ppc4xx/adma.c @@ -1485,10 +1485,7 @@ static dma_cookie_t ppc440spe_adma_run_tx_complete_actions( /* call the callback (must not sleep or submit new * operations to this channel) */ - if (desc->async_tx.callback) - desc->async_tx.callback( - desc->async_tx.callback_param); - + dmaengine_desc_get_callback_invoke(&desc->async_tx, NULL); dma_descriptor_unmap(&desc->async_tx); } |