From: Takashi Iwai <tiwai@suse.de>
To: tom.ty89@gmail.com
Cc: alsa-devel@alsa-project.org
Subject: Re: [ALSA patch] [PATCH] ALSA: usb-audio: ignore broken processing/extension unit
Date: Mon, 17 Aug 2020 08:32:32 +0200 [thread overview]
Message-ID: <s5h8sedrddr.wl-tiwai@suse.de> (raw)
In-Reply-To: <5f39a502.1c69fb81.e7174.8615@mx.google.com>
On Sun, 16 Aug 2020 23:28:11 +0200,
tom.ty89@gmail.com wrote:
>
> From: Tom Yan <tom.ty89@gmail.com>
>
> Some devices have broken extension unit where getting current value doesn't work. Attempt that once when creating mixer control for it. If it fails, just ignore it, so that it won't cripple the device entirely (and/or make the error floods).
Could you give your Signed-off-by line? It's mandatory for merging to
the upstream.
thanks,
Takashi
> ---
> sound/usb/mixer.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
> index eab0fd4fd7c3..e0b7174c1043 100644
> --- a/sound/usb/mixer.c
> +++ b/sound/usb/mixer.c
> @@ -2367,7 +2367,7 @@ static int build_audio_procunit(struct mixer_build *state, int unitid,
> int num_ins;
> struct usb_mixer_elem_info *cval;
> struct snd_kcontrol *kctl;
> - int i, err, nameid, type, len;
> + int i, err, nameid, type, len, val;
> const struct procunit_info *info;
> const struct procunit_value_info *valinfo;
> const struct usbmix_name_map *map;
> @@ -2470,6 +2470,12 @@ static int build_audio_procunit(struct mixer_build *state, int unitid,
> break;
> }
>
> + err = get_cur_ctl_value(cval, cval->control << 8, &val);
> + if (err < 0) {
> + usb_mixer_elem_info_free(cval);
> + return -EINVAL;
> + }
> +
> kctl = snd_ctl_new1(&mixer_procunit_ctl, cval);
> if (!kctl) {
> usb_mixer_elem_info_free(cval);
> --
> 2.28.0
>
> _______________________________________________
> Patch mailing list
> Patch@alsa-project.org
> https://mailman.alsa-project.org/mailman/listinfo/patch
>
next prev parent reply other threads:[~2020-08-17 6:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-16 21:28 [PATCH] ALSA: usb-audio: ignore broken processing/extension unit tom.ty89
2020-08-17 6:32 ` Takashi Iwai [this message]
2020-08-17 17:20 tom.ty89
2020-08-17 17:59 ` [ALSA patch] " Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5h8sedrddr.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=tom.ty89@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).