---

yaml --- r: 110922 b: refs/heads/master c: 4e184f8 h: refs/heads/master v: v3
git-mirror · Aug 25, 2008 · 358a230 · 358a230
1 parent 60e90b5
commit 358a230
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77a23f2695bb2de0cd74599400dc55109c531b72
+refs/heads/master: 4e184f8fc06411f35fdcf4b9bc6187c857bf7214
diff --git a/trunk/sound/core/memalloc.c b/trunk/sound/core/memalloc.c
@@ -277,11 +277,16 @@ int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size,
 	int err;
 
 	while ((err = snd_dma_alloc_pages(type, device, size, dmab)) < 0) {
+		size_t aligned_size;
 		if (err != -ENOMEM)
 			return err;
-		size >>= 1;
 		if (size <= PAGE_SIZE)
 			return -ENOMEM;
+		aligned_size = PAGE_SIZE << get_order(size);
+		if (size != aligned_size)
+			size = aligned_size;
+		else
+			size >>= 1;
 	}
 	if (! dmab->area)
 		return -ENOMEM;