diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-08-02 09:04:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-08-02 09:04:48 +0200 |
| commit | 01099b1ad9101ca3f41071a87b9c496d9ea1d2ad (patch) | |
| tree | 0fe7a9b87fd8dea482089c49ce65c4b5b4a9a135 /sound/core/memalloc.c | |
| parent | ALSA: core: Fix double calls of snd_card_free() via devres (diff) | |
| parent | ALSA: memalloc: Fix regression with SNDRV_DMA_TYPE_CONTINUOUS (diff) | |
| download | linux-01099b1ad9101ca3f41071a87b9c496d9ea1d2ad.tar.xz linux-01099b1ad9101ca3f41071a87b9c496d9ea1d2ad.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/core/memalloc.c')
| -rw-r--r-- | sound/core/memalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 3a78fdad1ab4..da5c8be84a82 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -261,7 +261,7 @@ static int snd_dma_continuous_mmap(struct snd_dma_buffer *dmab, struct vm_area_struct *area) { return remap_pfn_range(area, area->vm_start, - dmab->addr >> PAGE_SHIFT, + page_to_pfn(virt_to_page(dmab->area)), area->vm_end - area->vm_start, area->vm_page_prot); } |