---

yaml --- r: 99122 b: refs/heads/master c: 2843730 h: refs/heads/master v: v3
git-mirror · Jun 17, 2008 · a6fa7a2 · a6fa7a2
1 parent 9e5e7c2
commit a6fa7a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f515b6898d0f2c1b9eb34ae9986794045f34e2b
+refs/heads/master: 284373059f9605442cac6453780f6aaecf9abac1
diff --git a/trunk/sound/pci/emu10k1/memory.c b/trunk/sound/pci/emu10k1/memory.c
@@ -465,15 +465,12 @@ static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk
 		struct page *p = alloc_page(GFP_KERNEL | GFP_DMA32 |
 					    __GFP_NOWARN);
 		if (!p || (page_to_pfn(p) & ~(emu->dma_mask >> PAGE_SHIFT))) {
+			if (p)
+				__free_page(p);
 			/* try to allocate from <16MB zone */
-			struct page *p1 =
-				alloc_page(GFP_ATOMIC | GFP_DMA |
+			p = alloc_page(GFP_ATOMIC | GFP_DMA |
 				       __GFP_NORETRY | /* no OOM-killer */
 				       __GFP_NOWARN);
-			/* free page outside dma_mask range */
-			if (p)
-				free_page((unsigned long)page_address(p));
-			p = p1;
 		}
 		if (!p) {
 			__synth_free_pages(emu, first_page, page - 1);