[pulseaudio-commits] r1524 - /branches/lennart/src/modules/module-oss.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Wed Jul 25 16:40:12 2007
New Revision: 1524

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1524&root=3Dpulseaudio&vi=
ew=3Drev
Log:
change order of munmap and freeing of memblocks

Modified:
    branches/lennart/src/modules/module-oss.c

Modified: branches/lennart/src/modules/module-oss.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/mo=
dule-oss.c?rev=3D1524&root=3Dpulseaudio&r1=3D1523&r2=3D1524&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/module-oss.c (original)
+++ branches/lennart/src/modules/module-oss.c Wed Jul 25 16:40:12 2007
@@ -1297,15 +1297,6 @@
     if (u->memchunk.memblock)
         pa_memblock_unref(u->memchunk.memblock);
 =

-    if (u->in_mmap && u->in_mmap !=3D MAP_FAILED)
-        munmap(u->in_mmap, u->in_hwbuf_size);
-
-    if (u->out_mmap && u->out_mmap !=3D MAP_FAILED)
-        munmap(u->out_mmap, u->out_hwbuf_size);
-    =

-    if (u->fd >=3D 0)
-        close(u->fd);
-
     if (u->out_mmap_memblocks) {
         unsigned i;
         for (i =3D 0; i < u->out_nfrags; i++)
@@ -1322,6 +1313,15 @@
         pa_xfree(u->in_mmap_memblocks);
     }
 =

+    if (u->in_mmap && u->in_mmap !=3D MAP_FAILED)
+        munmap(u->in_mmap, u->in_hwbuf_size);
+
+    if (u->out_mmap && u->out_mmap !=3D MAP_FAILED)
+        munmap(u->out_mmap, u->out_hwbuf_size);
+    =

+    if (u->fd >=3D 0)
+        close(u->fd);
+
     pa_xfree(u->device_name);
     =

     pa_xfree(u);