From ecd5c686a2e00f6758ddc1c0b87c0797f1644a9b Mon Sep 17 00:00:00 2001
From: Hiroshi Doyu <hdoyu@nvidia.com>
Date: Tue, 11 Sep 2012 07:39:39 +0200
Subject: [PATCH] --- yaml --- r: 328951 b: refs/heads/master c:
 5a796eeb7bbacc628044b12a2d000167ddbabec8 h: refs/heads/master i:   328949:
 736ac76478cb73959ff1ea54258eb2dfd1e93eb2   328947:
 15dad40acf919dcc977adac661b12362deb964ab   328943:
 ea95fea93699988ee5f4c585c5e81f5253d0b7bb v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mm/dma-mapping.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 73a0db15f450..aea3fbd7d7fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdd43cb39f1b1e897c5d7992d05d0b9f0dd786d1
+refs/heads/master: 5a796eeb7bbacc628044b12a2d000167ddbabec8
diff --git a/trunk/arch/arm/mm/dma-mapping.c b/trunk/arch/arm/mm/dma-mapping.c
index 13f555d62491..c390cea6a258 100644
--- a/trunk/arch/arm/mm/dma-mapping.c
+++ b/trunk/arch/arm/mm/dma-mapping.c
@@ -1012,11 +1012,12 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, gfp_t
 		if (!pages[i])
 			goto error;
 
-		if (order)
+		if (order) {
 			split_page(pages[i], order);
-		j = 1 << order;
-		while (--j)
-			pages[i + j] = pages[i] + j;
+			j = 1 << order;
+			while (--j)
+				pages[i + j] = pages[i] + j;
+		}
 
 		__dma_clear_buffer(pages[i], PAGE_SIZE << order);
 		i += 1 << order;