提交 36440bbc 编写于 作者: T Takashi Iwai 提交者: Zheng Zengkai

ALSA: hda/via: Fix missing beep setup

stable inclusion
from stable-v5.10.127
commit 12a6be5d11d0799c59fe6578793ffabd20b8e60b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5XDDK

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=12a6be5d11d0799c59fe6578793ffabd20b8e60b

--------------------------------

commit c7807b27 upstream.

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: 0e8f9862 ("ALSA: hda/via - Simplify control management")
Cc: <stable@vger.kernel.org>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216152
Link: https://lore.kernel.org/r/20220620104008.1994-2-tiwai@suse.deSigned-off-by: NTakashi Iwai <tiwai@suse.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 e7b6a31b
...@@ -520,11 +520,11 @@ static int via_parse_auto_config(struct hda_codec *codec) ...@@ -520,11 +520,11 @@ static int via_parse_auto_config(struct hda_codec *codec)
if (err < 0) if (err < 0)
return err; return err;
err = snd_hda_gen_parse_auto_config(codec, &spec->gen.autocfg); err = auto_parse_beep(codec);
if (err < 0) if (err < 0)
return err; return err;
err = auto_parse_beep(codec); err = snd_hda_gen_parse_auto_config(codec, &spec->gen.autocfg);
if (err < 0) if (err < 0)
return err; return err;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册