diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2019-06-13 15:09:01 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-06-13 15:51:26 +0200 |
| commit | 855b5e01c0732d66c306cdd5215c3337e5311899 (patch) | |
| tree | b5e9874f147163ce091ad212544741a4e466592b /sound/pci/hda/patch_hdmi.c | |
| parent | 3e985effb25edcf500a58f41be71cc049b1b837f (diff) | |
ALSA: hda/hdmi - consider eld_valid also in sync_eld_via_acomp()
In the commit 7f641e26a6df9269cb25dd7a4b0a91d6586ed441 (ALSA: hda/hdmi
- Consider eld_valid when reporting jack event) the eld_valid check was
added for the jack event reports. Do the same in sync_eld_via_acomp()
function. Apparently, it is required for the NVIDIA proprietary driver
(monitor presence reported first, but ELD is available later).
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 0c61c05503f5..b522314ec5be 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1627,7 +1627,8 @@ static void sync_eld_via_acomp(struct hda_codec *codec, if (jack == NULL) goto unlock; snd_jack_report(jack, - eld->monitor_present ? SND_JACK_AVOUT : 0); + (eld->monitor_present && eld->eld_valid) ? + SND_JACK_AVOUT : 0); unlock: mutex_unlock(&per_pin->lock); } |