8e2d7107d3
- cgroup, libata, workqueue, block, akpm, usb merges
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From e36b3efcd07ab5c323e82319577d972ebddcbed1 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Fri, 18 Mar 2016 18:01:53 +0100
|
|
Subject: [PATCH 2/3] 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>
|
|
---
|
|
sound/pci/hda/patch_hdmi.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
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)
|
|
--
|
|
2.5.0
|
|
|