From 6c3d72fd4e9806fa749da1d7d54ee54a043be778 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 22 Sep 2011 10:32:25 +0100
Subject: [PATCH] --- yaml --- r: 264114 b: refs/heads/master c:
 d8e89b47e00ee80e920761145144640aac4cf71a h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mm/dma-mapping.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1ef4522fc026..de4e22ad1525 100644
--- 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
index 0a0a1e7c20d2..c3ff82f92d9c 100644
--- 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;
 }