X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=sound%2Fcore%2Fmemalloc.c;h=753d5fc4b284fa66cd0f3911d4096322fd7b3bf9;hb=79018e171ae5dd3178f199b7731f82e7dbdefb5f;hp=7f89d3c79a4b740b655342ebf4958d05fe6c6646;hpb=0ab912978c626ea6afd6ee85845ba9356fcda8cc;p=platform%2Fkernel%2Flinux-rpi.git

diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index 7f89d3c..753d5fc 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -242,16 +242,12 @@ 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;
 		if (size <= PAGE_SIZE)
 			return -ENOMEM;
-		aligned_size = PAGE_SIZE << get_order(size);
-		if (size != aligned_size)
-			size = aligned_size;
-		else
-			size >>= 1;
+		size >>= 1;
+		size = PAGE_SIZE << get_order(size);
 	}
 	if (! dmab->area)
 		return -ENOMEM;