ALSA: hda/conexant: Fix missing beep setup
PATCH 1/2 ALSA: hda/conexant: Fix missing beep setup
Currently the Conexant codec driver sets up the beep NID after calling snd_hda_gen_parse_auto_config(). It turned out that this results in the insufficient setup for the beep control, as the generic parser handles the fake path in snd_hda_gen_parse_auto_config() only if the beep_nid is set up beforehand.
For dealing with the beep widget properly, call cx_auto_parse_beep() before snd_hda_gen_parse_auto_config() call.
Fixes 51e19ca5f755 ("ALSA: hda/conexant - Clean up beep code")
Cc <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
--- sound/pci/hda/patch_conexant.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/hda/patch_conexant.c +2 -2
@@ -1079,11 +1079,11 @@ static int patch_conexant_auto(struct hda_codec *codec)if (err <0 ) goto error; - err =snd_hda_gen_parse_auto_config (codec, &spec->gen.autocfg); + err =cx_auto_parse_beep (codec);if (err <0 ) goto error; - err =cx_auto_parse_beep (codec); + err =snd_hda_gen_parse_auto_config (codec, &spec->gen.autocfg);if (err <0 ) goto error;
Signature · 1 line
2.35.3
PATCH 2/2 ALSA: hda/via: Fix missing beep setup
Like the previous fix for Conexant codec, the beep_nid has to be set up before calling snd_hda_gen_parse_auto_config(); otherwise it'd miss the path setup.
Fix the call order for addressing the missing beep setup.
Fixes 0e8f9862493a ("ALSA: hda/via - Simplify control management")
Cc <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
--- sound/pci/hda/patch_via.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/hda/patch_via.c +2 -2
@@ -518,11 +518,11 @@ static int via_parse_auto_config(struct hda_codec *codec)if (err <0 )return err; - err =snd_hda_gen_parse_auto_config (codec, &spec->gen.autocfg); + err =auto_parse_beep (codec);if (err <0 )return err; - err =auto_parse_beep (codec); + err =snd_hda_gen_parse_auto_config (codec, &spec->gen.autocfg);if (err <0 )return err;
Signature · 1 line
2.35.3