Commit 781711a9 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

ALSA: emu10k1 - Fix page allocation with GFP_DMA 



Added the missing GFP_ATOMIC to page_alloc when called with GFP_DMA.
GFP_KERNEL often results in stalls for ZONE_DMA, so GFP_ATOMIC is more
prgmatic.

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

sound/pci/emu10k1/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk 
					    __GFP_NOWARN);

		if (!p || (page_to_pfn(p) & ~(emu->dma_mask >> PAGE_SHIFT)))

			/* try to allocate from <16MB zone */

			p = alloc_page(GFP_DMA |

			p = alloc_page(GFP_ATOMIC | GFP_DMA |

				       __GFP_NORETRY | /* no OOM-killer */

				       __GFP_NOWARN);

		if (!p) {