ALSA CVS update

D:2003/08/31 20:47:16
C:PCM Midlevel
A:Jaroslav Kysela <perex@suse.cz>
F:core/pcm_native.c:1.78->1.79
L:get_page() fix

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index f82b4f5cfce0645ae39b06debc97ed4879fbc8cb..4a7faecdc00b58b464a1671994a34045b90536d4 100644 (file)
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2791,7 +2791,8 @@ static struct page * snd_pcm_mmap_status_nopage(struct vm_area_struct *area, uns
                return NOPAGE_OOM;
        runtime = substream->runtime;
        page = virt_to_page(runtime->status);
-       get_page(page);
+       if (!PageReserved(page))
+               get_page(page);
        return page;
 }
 
@@ -2828,7 +2829,8 @@ static struct page * snd_pcm_mmap_control_nopage(struct vm_area_struct *area, un
                return NOPAGE_OOM;
        runtime = substream->runtime;
        page = virt_to_page(runtime->control);
-       get_page(page);
+       if (!PageReserved(page))
+               get_page(page);
        return page;
 }
 
@@ -2893,7 +2895,8 @@ static struct page * snd_pcm_mmap_data_nopage(struct vm_area_struct *area, unsig
                vaddr = runtime->dma_area + offset;
                page = virt_to_page(vaddr);
        }
-       get_page(page);
+       if (!PageReserved(page))
+               get_page(page);
        return page;
 }