diff options
Diffstat (limited to 'drivers/dma/iop-adma.c')
| -rw-r--r-- | drivers/dma/iop-adma.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index b57564dd0232..434013d41288 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c | |||
| @@ -82,17 +82,24 @@ iop_adma_run_tx_complete_actions(struct iop_adma_desc_slot *desc, | |||
| 82 | struct device *dev = | 82 | struct device *dev = |
| 83 | &iop_chan->device->pdev->dev; | 83 | &iop_chan->device->pdev->dev; |
| 84 | u32 len = unmap->unmap_len; | 84 | u32 len = unmap->unmap_len; |
| 85 | u32 src_cnt = unmap->unmap_src_cnt; | 85 | enum dma_ctrl_flags flags = desc->async_tx.flags; |
| 86 | dma_addr_t addr = iop_desc_get_dest_addr(unmap, | 86 | u32 src_cnt; |
| 87 | iop_chan); | 87 | dma_addr_t addr; |
| 88 | 88 | ||
| 89 | dma_unmap_page(dev, addr, len, DMA_FROM_DEVICE); | 89 | if (!(flags & DMA_COMPL_SKIP_DEST_UNMAP)) { |
| 90 | while (src_cnt--) { | 90 | addr = iop_desc_get_dest_addr(unmap, iop_chan); |
| 91 | addr = iop_desc_get_src_addr(unmap, | 91 | dma_unmap_page(dev, addr, len, DMA_FROM_DEVICE); |
| 92 | iop_chan, | 92 | } |
| 93 | src_cnt); | 93 | |
| 94 | dma_unmap_page(dev, addr, len, | 94 | if (!(flags & DMA_COMPL_SKIP_SRC_UNMAP)) { |
| 95 | DMA_TO_DEVICE); | 95 | src_cnt = unmap->unmap_src_cnt; |
| 96 | while (src_cnt--) { | ||
| 97 | addr = iop_desc_get_src_addr(unmap, | ||
| 98 | iop_chan, | ||
| 99 | src_cnt); | ||
| 100 | dma_unmap_page(dev, addr, len, | ||
| 101 | DMA_TO_DEVICE); | ||
| 102 | } | ||
| 96 | } | 103 | } |
| 97 | desc->group_head = NULL; | 104 | desc->group_head = NULL; |
| 98 | } | 105 | } |