From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 9 Sep 2009 09:24:11 +0000 (+0200)
Subject: Revert "Fix driver conf parsing in snd_config_hook_load_for_all_cards()"
X-Git-Tag: v1.0.21a~3
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=133819d420d962b6888c280352a5532da93f1a3a;p=alsa-lib.git

Revert "Fix driver conf parsing in snd_config_hook_load_for_all_cards()"

This reverts commit 96da0c842d14b40ce8e37726b259229634b3aa21.

This way of fix brokes card-specific configuration loading.
See http://bugzilla.redhat.com bug#521988 for details.

Appropriate way to handle this problem is to fix the dmix configuration file.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/src/conf.c b/src/conf.c
index 3f0dfe17..570c90fa 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -3477,8 +3477,9 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
 			err = snd_determine_driver(card, &fdriver);
 			if (err < 0)
 				return err;
-			if (snd_config_search(root, fdriver, &n) >= 0 &&
-			    snd_config_get_string(n, &driver) >= 0) {
+			if (snd_config_search(root, fdriver, &n) >= 0) {
+				if (snd_config_get_string(n, &driver) < 0)
+					goto __err;
 				assert(driver);
 				while (1) {
 					char *s = strchr(driver, '.');