[pulseaudio-commits] src/modules

David Henningsson diwic at kemper.freedesktop.org
Fri Jun 28 08:27:28 PDT 2013


 src/modules/alsa/alsa-mixer.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 242b8e5fd3a00f984f0506de50825dbf3fbb401d
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Fri Jun 28 16:16:22 2013 +0200

    Revert "alsa-mixer: Add a couple of assertions"
    
    This reverts commit 2613e4c74733e67d56af165df4637bf902b08508.
    
    Please don't replace correct NULL pointer checks with assertions.

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index b2f6c2e..f4410d7 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -4530,9 +4530,10 @@ void pa_alsa_path_set_add_ports(
     pa_alsa_path *path;
     void *state;
 
-    pa_assert(ps);
     pa_assert(ports);
-    pa_assert(core);
+
+    if (!ps)
+        return;
 
     PA_HASHMAP_FOREACH(path, ps->paths, state) {
         if (!path->settings || !path->settings->next) {



More information about the pulseaudio-commits mailing list