diff mbox series

[SRU,Xenial,2/2] UBUNTU: SAUNCE: ALSA: hda/hdmi - Check pin_eld->monitor_present

Message ID 20200915035132.7731-3-hui.wang@canonical.com
State New
Headers show
Series alsa/hdmi: the hdmi audio stops working from Ubuntu-4.4.0-155.182 | expand

Commit Message

Hui Wang Sept. 15, 2020, 3:51 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1895603

We introduced a patch edbc693b5bd3 from stable update, the upstream
commit of that patch is 7f641e26a6df, that patch is for v5.2, if we
backport it to v4.4 kernel, we need to do some change since the
eld->monitor_present is not used in the v4.4 yet. So we change it to
use pin_eld->monitor_present.

Fixes: edbc693b5bd3 ("ALSA: hda/hdmi - Consider eld_valid when reporting jack event"
Signed-off-by: Hui Wang <hui.wang@canonical.com>
---
 sound/pci/hda/patch_hdmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 6178f82b8bbb..e4998b906634 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1638,7 +1638,7 @@  static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
 	jack = snd_hda_jack_tbl_get(codec, pin_nid);
 	if (jack) {
 		jack->block_report = !ret;
-		jack->pin_sense = (eld->monitor_present && eld->eld_valid) ?
+		jack->pin_sense = (pin_eld->monitor_present && eld->eld_valid) ?
 			AC_PINSENSE_PRESENCE : 0;
 	}
 	mutex_unlock(&per_pin->lock);