提交 8af2591d 编写于 作者: T Takashi Iwai

ALSA: hda - Don't register beep input device when no beep is available

We check now the availability of PC beep and skip the build of beep
mixers, but the driver still registers the input device.  This should
be checked as well.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 38faddb1
......@@ -10566,10 +10566,12 @@ static int patch_alc882(struct hda_codec *codec)
}
}
err = snd_hda_attach_beep_device(codec, 0x1);
if (err < 0) {
alc_free(codec);
return err;
if (spec->cdefine.enable_pcbeep) {
err = snd_hda_attach_beep_device(codec, 0x1);
if (err < 0) {
alc_free(codec);
return err;
}
}
if (board_config != ALC882_AUTO)
......@@ -12435,7 +12437,7 @@ static int patch_alc262(struct hda_codec *codec)
}
}
if (!spec->no_analog) {
if (!spec->no_analog && spec->cdefine.enable_pcbeep) {
err = snd_hda_attach_beep_device(codec, 0x1);
if (err < 0) {
alc_free(codec);
......@@ -14458,10 +14460,12 @@ static int patch_alc269(struct hda_codec *codec)
}
}
err = snd_hda_attach_beep_device(codec, 0x1);
if (err < 0) {
alc_free(codec);
return err;
if (spec->cdefine.enable_pcbeep) {
err = snd_hda_attach_beep_device(codec, 0x1);
if (err < 0) {
alc_free(codec);
return err;
}
}
if (board_config != ALC269_AUTO)
......@@ -18691,10 +18695,12 @@ static int patch_alc662(struct hda_codec *codec)
}
}
err = snd_hda_attach_beep_device(codec, 0x1);
if (err < 0) {
alc_free(codec);
return err;
if (spec->cdefine.enable_pcbeep) {
err = snd_hda_attach_beep_device(codec, 0x1);
if (err < 0) {
alc_free(codec);
return err;
}
}
if (board_config != ALC662_AUTO)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册