---

yaml --- r: 310941 b: refs/heads/master c: c080e26 h: refs/heads/master i: 310939: b8f87fb v: v3
git-mirror · Jun 14, 2012 · 99cc65b · 99cc65b
1 parent f98d953
commit 99cc65b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdb1117325ad719dc39e81209bc622d511db70e0
+refs/heads/master: c080e26edc3a2a3cdfa4c430c663ee1c3bbd8fae
diff --git a/trunk/arch/x86/kernel/pci-dma.c b/trunk/arch/x86/kernel/pci-dma.c
@@ -100,14 +100,15 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,
 				 struct dma_attrs *attrs)
 {
 	unsigned long dma_mask;
-	struct page *page = NULL;
+	struct page *page;
 	unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT;
 	dma_addr_t addr;
 
 	dma_mask = dma_alloc_coherent_mask(dev, flag);
 
 	flag |= __GFP_ZERO;
 again:
+	page = NULL;
 	if (!(flag & GFP_ATOMIC))
 		page = dma_alloc_from_contiguous(dev, count, get_order(size));
 	if (!page)