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/mv_xor.c | |
| parent | 7afb1fa8cba1ab0b458131ad0991cd4a4e7466b2 (diff) | |
| parent | fd3c69bd19244aa8cbf859561fd1b9f4ebc1d1c3 (diff) | |
| download | lwn-96622bde4c3fc0b442d25646f70043a884d54285.tar.gz lwn-96622bde4c3fc0b442d25646f70043a884d54285.zip | |
Merge branch 'topic/unmap_cleanup' into for-linus
Diffstat (limited to 'drivers/dma/mv_xor.c')
| -rw-r--r-- | drivers/dma/mv_xor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index a4f0eb1d1d9c..23f75285a4d9 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c @@ -206,11 +206,11 @@ mv_desc_run_tx_complete_actions(struct mv_xor_desc_slot *desc, if (desc->async_tx.cookie > 0) { cookie = desc->async_tx.cookie; + 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 */ |