From c24bdf66df719093d9436cfeccd724eebb5d8a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Tue, 23 Apr 2013 10:55:31 +0200
Subject: [PATCH] mixer: prevent mem leak and let default card setup on empty
 module config

---
 src/modules/mixer/e_mod_main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 30b345800..c5a31da68 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -785,7 +785,7 @@ _mixer_sys_setup(E_Mixer_Instance *inst)
    if (!conf->card)
      {
         ERR("conf->card in mixer sys setup is NULL");
-        return 1;
+        /* return 1; */
      }
 
    if (inst->sys)
@@ -842,6 +842,8 @@ _mixer_sys_setup_default_card(E_Mixer_Instance *inst)
    if (!card)
      goto error;
 
+   if (inst->sys)
+     e_mod_mixer_del(inst->sys);
    inst->sys = e_mod_mixer_new(card);
    if (!inst->sys)
      goto system_error;