mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

ALSA: hda - Enable unsol event for ATI and Nvidia HDMI codecs too

Browse source 
ATI and Nvidia HDMI codecs have also the pin-detection capability,
so let's enable the jack-detecion for them, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-06-15 14:40:21 +02:00
parent ceaa86ba2e
commit 250e41ac9f
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sound/pci/hda/patch_hdmi.c
View file

@ -1401,11 +1401,9 @@ static int simple_playback_build_controls(struct hda_codec *codec)
spec->cvts[i].cvt_nid);
if (err < 0)
return err;
if (codec->patch_ops.unsol_event) {
err = simple_hdmi_build_jack(codec, i);
if (err < 0)
return err;
}
err = simple_hdmi_build_jack(codec, i);
if (err < 0)
return err;
}
return 0;
@ -1589,6 +1587,7 @@ static const struct hda_codec_ops simple_hdmi_patch_ops = {
.build_pcms = simple_playback_build_pcms,
.init = simple_playback_init,
.free = simple_playback_free,
.unsol_event = simple_hdmi_unsol_event,
};
static int patch_simple_hdmi(struct hda_codec *codec,
@ -1875,11 +1874,7 @@ static int patch_atihdmi(struct hda_codec *codec)
static int patch_via_hdmi(struct hda_codec *codec)
{
int err = patch_simple_hdmi(codec, VIAHDMI_CVT_NID, VIAHDMI_PIN_NID);
if (err < 0)
return err;
codec->patch_ops.unsol_event = simple_hdmi_unsol_event;
return 0;
return patch_simple_hdmi(codec, VIAHDMI_CVT_NID, VIAHDMI_PIN_NID);
}
/*