---

yaml --- r: 321505 b: refs/heads/master c: d9e0d14 h: refs/heads/master i: 321503: d5e7168 v: v3
git-mirror · Aug 9, 2012 · 9e9776c · 9e9776c
1 parent d8cc86f
commit 9e9776c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4ea6918c93b9f59d34e8ca2124b2b64b1afe73b
+refs/heads/master: d9e0d149b5dcc2ef4688afc572b9906bcda941ef
diff --git a/trunk/arch/arm/mm/dma-mapping.c b/trunk/arch/arm/mm/dma-mapping.c
@@ -648,12 +648,12 @@ void arm_dma_free(struct device *dev, size_t size, void *cpu_addr,
 
 	if (arch_is_coherent() || nommu()) {
 		__dma_free_buffer(page, size);
+	} else if (__free_from_pool(cpu_addr, size)) {
+		return;
 	} else if (!IS_ENABLED(CONFIG_CMA)) {
 		__dma_free_remap(cpu_addr, size);
 		__dma_free_buffer(page, size);
 	} else {
-		if (__free_from_pool(cpu_addr, size))
-			return;
 		/*
 		 * Non-atomic allocations cannot be freed with IRQs disabled
 		 */