From: Pierre Ossman <ossman@cendio.se>
Date: Sun, 5 Mar 2006 15:42:37 +0000 (+0000)
Subject: Tried to get the volume information even upon init failure.
X-Git-Tag: 1.0_branch~3892
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b6a9c3829fe17dc836a3220bff1f9b4e35d3a57;p=profile%2Fivi%2Fpulseaudio.git

Tried to get the volume information even upon init failure.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@626 fefdeb5f-60dc-0310-8127-8f9354f1896f
---

diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 732612e..0053acd 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -409,16 +409,16 @@ int pa__init(pa_core *c, pa_module*m) {
     u->memchunk.index = u->memchunk.length = 0;
     
     ret = 0;
-     
-finish:
-     if (ma)
-         pa_modargs_free(ma);
 
     /* Get initial mixer settings */
     if (u->sink->get_hw_volume)
         u->sink->get_hw_volume(u->sink);
     if (u->sink->get_hw_mute)
         u->sink->get_hw_mute(u->sink);
+     
+finish:
+     if (ma)
+         pa_modargs_free(ma);
     
     return ret;
 
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index 1b7ae7d..5a6dc14 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -398,15 +398,15 @@ int pa__init(pa_core *c, pa_module*m) {
     
     ret = 0;
 
-finish:
-     if (ma)
-         pa_modargs_free(ma);
-
     /* Get initial mixer settings */
     if (u->source->get_hw_volume)
         u->source->get_hw_volume(u->source);
     if (u->source->get_hw_mute)
         u->source->get_hw_mute(u->source);
+
+finish:
+     if (ma)
+         pa_modargs_free(ma);
     
     return ret;