diff options
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
-rw-r--r-- | sound/pci/hda/patch_hdmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 9850c5b481ea..ea6d85d48444 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <sound/jack.h> | 36 | #include <sound/jack.h> |
37 | #include "hda_codec.h" | 37 | #include "hda_codec.h" |
38 | #include "hda_local.h" | 38 | #include "hda_local.h" |
39 | #include "hda_jack.h" | ||
39 | 40 | ||
40 | static bool static_hdmi_pcm; | 41 | static bool static_hdmi_pcm; |
41 | module_param(static_hdmi_pcm, bool, 0644); | 42 | module_param(static_hdmi_pcm, bool, 0644); |
@@ -766,6 +767,7 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) | |||
766 | if (pin_idx < 0) | 767 | if (pin_idx < 0) |
767 | return; | 768 | return; |
768 | 769 | ||
770 | snd_hda_jack_set_dirty(codec, pin_nid); | ||
769 | hdmi_present_sense(&spec->pins[pin_idx], true); | 771 | hdmi_present_sense(&spec->pins[pin_idx], true); |
770 | } | 772 | } |
771 | 773 | ||
@@ -1282,9 +1284,7 @@ static int generic_hdmi_init(struct hda_codec *codec) | |||
1282 | struct hdmi_eld *eld = &per_pin->sink_eld; | 1284 | struct hdmi_eld *eld = &per_pin->sink_eld; |
1283 | 1285 | ||
1284 | hdmi_init_pin(codec, pin_nid); | 1286 | hdmi_init_pin(codec, pin_nid); |
1285 | snd_hda_codec_write(codec, pin_nid, 0, | 1287 | snd_hda_jack_detect_enable(codec, pin_nid, pin_nid); |
1286 | AC_VERB_SET_UNSOLICITED_ENABLE, | ||
1287 | AC_USRSP_EN | pin_nid); | ||
1288 | 1288 | ||
1289 | per_pin->codec = codec; | 1289 | per_pin->codec = codec; |
1290 | INIT_DELAYED_WORK(&per_pin->work, hdmi_repoll_eld); | 1290 | INIT_DELAYED_WORK(&per_pin->work, hdmi_repoll_eld); |