mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

change order of munmap and freeing of memblocks

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1524 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-07-25 14:40:12 +00:00
parent c76d035dad
commit a094923fd5
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/module-oss.c
View file

@ -1297,15 +1297,6 @@ void pa__done(pa_core *c, pa_module*m) {
if (u->memchunk.memblock) if (u->memchunk.memblock)
pa_memblock_unref(u->memchunk.memblock); pa_memblock_unref(u->memchunk.memblock);
if (u->in_mmap && u->in_mmap != MAP_FAILED)
munmap(u->in_mmap, u->in_hwbuf_size);
if (u->out_mmap && u->out_mmap != MAP_FAILED)
munmap(u->out_mmap, u->out_hwbuf_size);
if (u->fd >= 0)
close(u->fd);
if (u->out_mmap_memblocks) { if (u->out_mmap_memblocks) {
unsigned i; unsigned i;
for (i = 0; i < u->out_nfrags; i++) for (i = 0; i < u->out_nfrags; i++)
@ -1322,6 +1313,15 @@ void pa__done(pa_core *c, pa_module*m) {
pa_xfree(u->in_mmap_memblocks); pa_xfree(u->in_mmap_memblocks);
} }
if (u->in_mmap && u->in_mmap != MAP_FAILED)
munmap(u->in_mmap, u->in_hwbuf_size);
if (u->out_mmap && u->out_mmap != MAP_FAILED)
munmap(u->out_mmap, u->out_hwbuf_size);
if (u->fd >= 0)
close(u->fd);
pa_xfree(u->device_name); pa_xfree(u->device_name);
pa_xfree(u); pa_xfree(u);