---

yaml --- r: 264114 b: refs/heads/master c: d8e89b4 h: refs/heads/master v: v3
git-mirror · Sep 26, 2011 · 6c3d72f · 6c3d72f
1 parent 2ecc3d3
commit 6c3d72f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6760b109603c794e4bd281c0014fef069c019b6a
+refs/heads/master: d8e89b47e00ee80e920761145144640aac4cf71a
diff --git a/trunk/arch/arm/mm/dma-mapping.c b/trunk/arch/arm/mm/dma-mapping.c
@@ -324,6 +324,8 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp,
 
 	if (addr)
 		*handle = pfn_to_dma(dev, page_to_pfn(page));
+	else
+		__dma_free_buffer(page, size);
 
 	return addr;
 }