]> git.hungrycats.org Git - linux/commitdiff
ALSA: hda - Fix forgotten HDMI monitor_present update
authorTakashi Iwai <tiwai@suse.de>
Fri, 18 Mar 2016 17:01:53 +0000 (18:01 +0100)
committerSasha Levin <sasha.levin@oracle.com>
Mon, 18 Apr 2016 12:51:04 +0000 (08:51 -0400)
[ Upstream commit bd48128539ab89986b24ad08ecd3e027dd1993a1 ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
sound/pci/hda/patch_hdmi.c

index 973fab9be89925bb91c288d8059926d67c324dd7..b320120f5d117d0f62e689450f233ae8e8437964 100644 (file)
@@ -1547,6 +1547,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)