diff options
| author | Vinod Koul | 2013-11-16 07:24:17 +0100 |
|---|---|---|
| committer | Vinod Koul | 2013-11-16 07:32:36 +0100 |
| commit | df12a3178d340319b1955be6b973a4eb84aff754 (patch) | |
| tree | 2b9c68f8a6c299d1e5a4026c60117b5c00d46008 /drivers/dma/pl330.c | |
| parent | dma: pl330: silence a compile warning (diff) | |
| parent | dma: mv_xor: Fix mis-usage of mmio 'base' and 'high_base' registers (diff) | |
| download | kernel-qcow2-linux-df12a3178d340319b1955be6b973a4eb84aff754.tar.gz kernel-qcow2-linux-df12a3178d340319b1955be6b973a4eb84aff754.tar.xz kernel-qcow2-linux-df12a3178d340319b1955be6b973a4eb84aff754.zip | |
Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine
Pull dmaengine changes from Dan
1/ Bartlomiej and Dan finalized a rework of the dma address unmap
implementation.
2/ In the course of testing 1/ a collection of enhancements to dmatest
fell out. Notably basic performance statistics, and fixed / enhanced
test control through new module parameters 'run', 'wait', 'noverify',
and 'verbose'. Thanks to Andriy and Linus for their review.
3/ Testing the raid related corner cases of 1/ triggered bugs in the
recently added 16-source operation support in the ioatdma driver.
4/ Some minor fixes / cleanups to mv_xor and ioatdma.
Conflicts:
drivers/dma/dmatest.c
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/pl330.c')
| -rw-r--r-- | drivers/dma/pl330.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 0ee2c547b304..877d7bb767d9 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2268,6 +2268,8 @@ static void pl330_tasklet(unsigned long data) list_move_tail(&desc->node, &pch->dmac->desc_pool); } + dma_descriptor_unmap(&desc->txd); + if (callback) { spin_unlock_irqrestore(&pch->lock, flags); callback(callback_param); |