---

yaml --- r: 328951 b: refs/heads/master c: 5a796ee h: refs/heads/master i: 328949: 736ac76 328947: 15dad40 328943: ea95fea v: v3
git-mirror · Oct 2, 2012 · ecd5c68 · ecd5c68
1 parent 5be28d0
commit ecd5c68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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;