Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 22:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: emu10k1 - simplify the last fix

Browse Source 
Clean up the previous commit for fixing memory leaks.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2008-06-17 16:30:27 +02:00
parent 9f515b6898
commit 284373059f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/pci/emu10k1/memory.c
View File

@ -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 | struct page *p = alloc_page(GFP_KERNEL | GFP_DMA32 |
__GFP_NOWARN); __GFP_NOWARN);
if (!p || (page_to_pfn(p) & ~(emu->dma_mask >> PAGE_SHIFT))) { if (!p || (page_to_pfn(p) & ~(emu->dma_mask >> PAGE_SHIFT))) {
if (p)
__free_page(p);
/* try to allocate from <16MB zone */ /* try to allocate from <16MB zone */
struct page *p1 = p = alloc_page(GFP_ATOMIC | GFP_DMA |
alloc_page(GFP_ATOMIC | GFP_DMA |
__GFP_NORETRY | /* no OOM-killer */ __GFP_NORETRY | /* no OOM-killer */
__GFP_NOWARN); __GFP_NOWARN);
/* free page outside dma_mask range */
if (p)
free_page((unsigned long)page_address(p));
p = p1;
} }
if (!p) { if (!p) {
__synth_free_pages(emu, first_page, page - 1); __synth_free_pages(emu, first_page, page - 1);