[alsa-devel] [PATCH] amixer: Don't set only the first item in sset_enum()
From: Peter Meerwald p.meerwald@bct-electronic.com
Signed-off-by: Peter Meerwald pmeerw@pmeerw.net --- amixer/amixer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/amixer/amixer.c b/amixer/amixer.c index ed60e7c..36c92eb 100644 --- a/amixer/amixer.c +++ b/amixer/amixer.c @@ -1278,7 +1278,7 @@ static int get_enum_item_index(snd_mixer_elem_t *elem, char **ptrp)
static int sset_enum(snd_mixer_elem_t *elem, unsigned int argc, char **argv) { - unsigned int idx, chn = 0; + unsigned int idx, item = 0; int check_flag = ignore_error ? 0 : -1;
for (idx = 1; idx < argc; idx++) { @@ -1287,7 +1287,7 @@ static int sset_enum(snd_mixer_elem_t *elem, unsigned int argc, char **argv) int ival = get_enum_item_index(elem, &ptr); if (ival < 0) return check_flag; - if (snd_mixer_selem_set_enum_item(elem, chn, ival) >= 0) + if (snd_mixer_selem_set_enum_item(elem, item++, ival) >= 0) check_flag = 1; /* skip separators */ while (*ptr == ',' || isspace(*ptr))
At Tue, 3 Mar 2015 18:39:52 +0100, Peter Meerwald wrote:
From: Peter Meerwald p.meerwald@bct-electronic.com
Signed-off-by: Peter Meerwald pmeerw@pmeerw.net
Applied, thanks.
Takashi
amixer/amixer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/amixer/amixer.c b/amixer/amixer.c index ed60e7c..36c92eb 100644 --- a/amixer/amixer.c +++ b/amixer/amixer.c @@ -1278,7 +1278,7 @@ static int get_enum_item_index(snd_mixer_elem_t *elem, char **ptrp)
static int sset_enum(snd_mixer_elem_t *elem, unsigned int argc, char **argv) {
- unsigned int idx, chn = 0;
unsigned int idx, item = 0; int check_flag = ignore_error ? 0 : -1;
for (idx = 1; idx < argc; idx++) {
@@ -1287,7 +1287,7 @@ static int sset_enum(snd_mixer_elem_t *elem, unsigned int argc, char **argv) int ival = get_enum_item_index(elem, &ptr); if (ival < 0) return check_flag;
if (snd_mixer_selem_set_enum_item(elem, chn, ival) >= 0)
if (snd_mixer_selem_set_enum_item(elem, item++, ival) >= 0) check_flag = 1; /* skip separators */ while (*ptr == ',' || isspace(*ptr))
-- 1.7.9.5
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
participants (2)
-
Peter Meerwald
-
Takashi Iwai