Skip to content

Commit 5faa0bc

Browse files
committed
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: 51e19ca ("ALSA: hda/conexant - Clean up beep code") Cc: <[email protected]> Link: https://bugzilla.kernel.org/show_bug.cgi?id=216152 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 9882d63 commit 5faa0bc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sound/pci/hda/patch_conexant.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,11 +1079,11 @@ static int patch_conexant_auto(struct hda_codec *codec)
10791079
if (err < 0)
10801080
goto error;
10811081

1082-
err = snd_hda_gen_parse_auto_config(codec, &spec->gen.autocfg);
1082+
err = cx_auto_parse_beep(codec);
10831083
if (err < 0)
10841084
goto error;
10851085

1086-
err = cx_auto_parse_beep(codec);
1086+
err = snd_hda_gen_parse_auto_config(codec, &spec->gen.autocfg);
10871087
if (err < 0)
10881088
goto error;
10891089

0 commit comments

Comments
 (0)