summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2006-03-05 15:42:37 +0000
committerPierre Ossman <ossman@cendio.se>2006-03-05 15:42:37 +0000
commit7b6a9c3829fe17dc836a3220bff1f9b4e35d3a57 (patch)
treefe9d2360f42de3dfa6041cfed41e5ddea7bc01e1 /src/modules
parentdcd202f8eb94ef14981f2b80c7f28a5936ba35a2 (diff)
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
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/module-alsa-sink.c8
-rw-r--r--src/modules/module-alsa-source.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 732612ef..0053acd2 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 1b7ae7d3..5a6dc144 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;