From 90b80eb8067df30c171309df48e3743fae52f12a Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Date: Mon, 5 Nov 2012 10:00:12 +0000
Subject: [PATCH] --- yaml --- r: 358478 b: refs/heads/master c:
 35fa4dbc8c877c69144736cfe144a95a1e7ccc1a h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/crypto/async_tx/async_memcpy.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9f60001ff612..dfb2d821767c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c88ae90939c2ef8ae80b07713b898c577b81598
+refs/heads/master: 35fa4dbc8c877c69144736cfe144a95a1e7ccc1a
diff --git a/trunk/crypto/async_tx/async_memcpy.c b/trunk/crypto/async_tx/async_memcpy.c
index 361b5e8239bc..9e62feffb374 100644
--- a/trunk/crypto/async_tx/async_memcpy.c
+++ b/trunk/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) {