diff options
| author | Colin Guthrie <cguthrie@mandriva.org> | 2010-06-05 18:21:31 +0100 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2010-06-05 18:21:31 +0100 |
| commit | 1415a295c25d331985c2e9a2a387ba0edd89ea0f (patch) | |
| tree | 1e225a2350d47b9e0b79572546a432b04c60de70 /src/modules/alsa/alsa-mixer.c | |
| parent | 3df68451010ff1f374cffbb325b7346640365152 (diff) | |
| parent | 22a8c4485be336267b44f72336af859f80014c09 (diff) | |
Merge remote branch 'tanuk2/fixes'
Diffstat (limited to 'src/modules/alsa/alsa-mixer.c')
| -rw-r--r-- | src/modules/alsa/alsa-mixer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index 93f2ed05..b2888a36 100644 --- a/src/modules/alsa/alsa-mixer.c +++ b/src/modules/alsa/alsa-mixer.c @@ -1037,7 +1037,7 @@ static int element_probe(pa_alsa_element *e, snd_mixer_t *m) { e->switch_use = PA_ALSA_SWITCH_IGNORE; e->volume_use = PA_ALSA_VOLUME_IGNORE; - e->enumeration_use = PA_ALSA_VOLUME_IGNORE; + e->enumeration_use = PA_ALSA_ENUMERATION_IGNORE; return 0; } @@ -2683,7 +2683,7 @@ static int mapping_parse_description( pa_assert(ps); if ((m = mapping_get(ps, section))) { - pa_xstrdup(m->description); + pa_xfree(m->description); m->description = pa_xstrdup(rvalue); } else if ((p = profile_get(ps, section))) { pa_xfree(p->description); |