Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[linux-2.6-microblaze.git] / crypto / async_tx / async_memcpy.c

diff --git a/crypto/async_tx/async_memcpy.c b/crypto/async_tx/async_memcpy.c
index 361b5e8..9e62fef 100644 (file)
--- a/crypto/async_tx/async_memcpy.c
+++ b/crypto/async_tx/async_memcpy.c
@@ -67,6 +67,12 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset,
 
                tx = device->device_prep_dma_memcpy(chan, dma_dest, dma_src,
                                                    len, dma_prep_flags);
+               if (!tx) {
+                       dma_unmap_page(device->dev, dma_dest, len,
+                                      DMA_FROM_DEVICE);
+                       dma_unmap_page(device->dev, dma_src, len,
+                                      DMA_TO_DEVICE);
+               }
        }
 
        if (tx) {