From: Colin Guthrie <cguthrie@mandriva.org>
Date: Fri, 4 Mar 2011 09:43:41 +0000 (+0000)
Subject: alsa-mixer: Fix a git-am cockup in b0f72311
X-Git-Tag: 1.0_branch~725
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4a2a8ebfe78e07593a34ab06968c67ba5d18d46;p=profile%2Fivi%2Fpulseaudio.git

alsa-mixer: Fix a git-am cockup in b0f72311

It seems git managed to mess up a git-am with a patch from
David which moved where this function was called element_probe
to within itself (recursive which could normally lead to an
infinite loop, but as it was now never called from anywhere else,
this didn't happen).

Thank you to Maarten for spotting and following up the issue.
---

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index e111388..fa07674 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -1154,9 +1154,6 @@ static int check_required(pa_alsa_element *e, snd_mixer_elem_t *me) {
         }
     }
 
-    if (check_required(e, me) < 0)
-        return -1;
-
     return 0;
 }
 
@@ -1360,6 +1357,9 @@ static int element_probe(pa_alsa_element *e, snd_mixer_t *m) {
         }
     }
 
+    if (check_required(e, me) < 0)
+        return -1;
+
     return 0;
 }