---

yaml --- r: 358478 b: refs/heads/master c: 35fa4db h: refs/heads/master v: v3
git-mirror · Jan 8, 2013 · 90b80eb · 90b80eb
1 parent 0e779e2
commit 90b80eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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) {