Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e184f8f authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

ALSA: Fix allocation size calculation in snd_dma_alloc_pages_fallback() 



snd_dma_alloc_pages_fallback() always tries to reduce the size in a half,
but it's not good when the given size isn't a power-of-two.
Check it first then try to align.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 77a23f26

sound/core/memalloc.c

+6 −1
Original line number Diff line number Diff line
@@ -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;