Revert "Fix driver conf parsing in snd_config_hook_load_for_all_cards()"
authorJaroslav Kysela <perex@perex.cz>
Wed, 9 Sep 2009 09:24:11 +0000 (11:24 +0200)
committerJaroslav Kysela <perex@perex.cz>
Wed, 9 Sep 2009 09:24:11 +0000 (11:24 +0200)
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>

src/conf.c

index 3f0dfe1..570c90f 100644 (file)
@@ -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, '.');