diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2009-09-09 11:24:11 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2009-09-09 11:24:11 +0200 |
| commit | 133819d420d962b6888c280352a5532da93f1a3a (patch) | |
| tree | eb9ae58828f6f32a6bb296f51f7415fb9f5f03cc | |
| parent | ac9de424bc0a896e8e30b5ec176daf924a2cefb2 (diff) | |
| download | alsa-lib-133819d420d962b6888c280352a5532da93f1a3a.tar.gz | |
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>
| -rw-r--r-- | src/conf.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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, '.'); |