diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:36:11 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:36:11 +0530 |
| commit | 96622bde4c3fc0b442d25646f70043a884d54285 (patch) | |
| tree | 907aa9927427a9845619236d1b15a23c1de4fc8e /drivers/dma/ppc4xx | |
| parent | 7afb1fa8cba1ab0b458131ad0991cd4a4e7466b2 (diff) | |
| parent | fd3c69bd19244aa8cbf859561fd1b9f4ebc1d1c3 (diff) | |
Merge branch 'topic/unmap_cleanup' into for-linus
Diffstat (limited to 'drivers/dma/ppc4xx')
| -rw-r--r-- | drivers/dma/ppc4xx/adma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c index d45da34a0568..b1535b1fe95c 100644 --- a/drivers/dma/ppc4xx/adma.c +++ b/drivers/dma/ppc4xx/adma.c @@ -1482,11 +1482,11 @@ static dma_cookie_t ppc440spe_adma_run_tx_complete_actions( cookie = desc->async_tx.cookie; desc->async_tx.cookie = 0; + dma_descriptor_unmap(&desc->async_tx); /* call the callback (must not sleep or submit new * operations to this channel) */ dmaengine_desc_get_callback_invoke(&desc->async_tx, NULL); - dma_descriptor_unmap(&desc->async_tx); } /* run dependent operations */ |