Commit 2722b535 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda/realtek - Check beep whitelist before assigning in all codecs

Some Realtek codec parsers didn't check the availability of PC beep.
Add has_cdefine_beep() check appropriately.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7c0a6939
...@@ -2848,7 +2848,8 @@ static int patch_alc268(struct hda_codec *codec) ...@@ -2848,7 +2848,8 @@ static int patch_alc268(struct hda_codec *codec)
return err; return err;
spec = codec->spec; spec = codec->spec;
spec->gen.beep_nid = 0x01; if (has_cdefine_beep(codec))
spec->gen.beep_nid = 0x01;
spec->shutup = alc_eapd_shutup; spec->shutup = alc_eapd_shutup;
...@@ -8102,7 +8103,8 @@ static int patch_alc861(struct hda_codec *codec) ...@@ -8102,7 +8103,8 @@ static int patch_alc861(struct hda_codec *codec)
return err; return err;
spec = codec->spec; spec = codec->spec;
spec->gen.beep_nid = 0x23; if (has_cdefine_beep(codec))
spec->gen.beep_nid = 0x23;
#ifdef CONFIG_PM #ifdef CONFIG_PM
spec->power_hook = alc_power_eapd; spec->power_hook = alc_power_eapd;
...@@ -8203,7 +8205,8 @@ static int patch_alc861vd(struct hda_codec *codec) ...@@ -8203,7 +8205,8 @@ static int patch_alc861vd(struct hda_codec *codec)
return err; return err;
spec = codec->spec; spec = codec->spec;
spec->gen.beep_nid = 0x23; if (has_cdefine_beep(codec))
spec->gen.beep_nid = 0x23;
spec->shutup = alc_eapd_shutup; spec->shutup = alc_eapd_shutup;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment