summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-03-18 18:01:53 +0100
committerTakashi Iwai <tiwai@suse.de>2016-03-18 18:01:53 +0100
commitbd48128539ab89986b24ad08ecd3e027dd1993a1 (patch)
treec9e0cf449ad4c0290698636218c80f76071f0bdb /sound
parentALSA: hda - Really restrict i915 notifier to HSW+ (diff)
downloadlinux-bd48128539ab89986b24ad08ecd3e027dd1993a1.tar.xz
linux-bd48128539ab89986b24ad08ecd3e027dd1993a1.zip
ALSA: hda - Fix forgotten HDMI monitor_present update
We forgot to copy monitor_present value when updating the ELD information. This won't change the ELD retrieval and the jack notification behavior, but appears only in the proc output. In that sense, it's no fatal error, but a bug is a bug is a bug. Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_hdmi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 8cdb804aa9cf..e7d9453ecd10 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1358,6 +1358,7 @@ static void update_eld(struct hda_codec *codec,
eld->eld_size) != 0)
eld_changed = true;
+ pin_eld->monitor_present = eld->monitor_present;
pin_eld->eld_valid = eld->eld_valid;
pin_eld->eld_size = eld->eld_size;
if (eld->eld_valid)