From 275afa4d709cecb5874646fa2fb10292c8699398 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 1 Oct 2006 17:57:36 +0200 Subject: [PATCH] simple mixer - fix error recovery path for volume / switch write If volume or switch write fails, the internal contents for element is changed, but it is wrong. Reread the whole simple element in this case to get correct values. --- src/mixer/simple_none.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index 58ffe4af..7c5b4ea8 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -515,7 +515,7 @@ static int elem_write_enum(selem_none_t *s) return 0; } -static int selem_write(snd_mixer_elem_t *elem) +static int selem_write_main(snd_mixer_elem_t *elem) { selem_none_t *s; unsigned int idx; @@ -598,6 +598,16 @@ static int selem_write(snd_mixer_elem_t *elem) return 0; } +static int selem_write(snd_mixer_elem_t *elem) +{ + int err; + + err = selem_write_main(elem); + if (err < 0) + selem_read(elem); + return err; +} + static void selem_free(snd_mixer_elem_t *elem) { selem_none_t *simple = snd_mixer_elem_get_private(elem); -- 2.47.1