ALSA: usb-audio: ignore broken processing/extension unit
PATCH 1/1 ALSA: usb-audio: ignore broken processing/extension unit
From: Tom Yan <[email protected]>
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).
--- sound/usb/mixer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
sound/usb/mixer.c +7 -1
@@ -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);
Signature · 1 line
2.28.0
Quoted 4 lines · On Sun, 16 Aug 2020 23:28:11 +0200, [email protected] wrote:
From: Tom Yan <[email protected]>
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
Quoted 38 lines
--- sound/usb/mixer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)sound/usb/mixer.c +7
-1@@ -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);Signature · 6 lines
2.28.0 _______________________________________________ Patch mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/patch