* [PATCH] amixer: Don't set only the first item in sset_enum()
@ 2015-03-03 17:39 Peter Meerwald
2015-03-05 10:06 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Peter Meerwald @ 2015-03-03 17:39 UTC (permalink / raw
To: alsa-devel; +Cc: Peter Meerwald
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))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] amixer: Don't set only the first item in sset_enum()
2015-03-03 17:39 [PATCH] amixer: Don't set only the first item in sset_enum() Peter Meerwald
@ 2015-03-05 10:06 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2015-03-05 10:06 UTC (permalink / raw
To: Peter Meerwald; +Cc: alsa-devel
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-05 10:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-03 17:39 [PATCH] amixer: Don't set only the first item in sset_enum() Peter Meerwald
2015-03-05 10:06 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.