This is a note to let you know that I've just added the patch titled ALSA: hda - Fix missing ELD update at unplugging to the 4.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: alsa-hda-fix-missing-eld-update-at-unplugging.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From c64c1437afb14ebc900e40910f31ffb20bf652ad Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@xxxxxxx> Date: Mon, 21 Mar 2016 16:07:30 +0100 Subject: ALSA: hda - Fix missing ELD update at unplugging From: Takashi Iwai <tiwai@xxxxxxx> commit c64c1437afb14ebc900e40910f31ffb20bf652ad upstream. i915 get_eld ops may return an error when no encoder is connected, and currently we regard the error as fatal and skip the whole ELD handling. This ended up with the missing ELD update at unplugging. This patch fixes the issue by treating the error as the unplugged state, instead of skipping the rest. Reported-by: Libin Yang <libin.yang@xxxxxxxxxxxxxxx> Signed-off-by: Takashi Iwai <tiwai@xxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- sound/pci/hda/patch_hdmi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1670,11 +1670,10 @@ static void sync_eld_via_acomp(struct hd int size; mutex_lock(&per_pin->lock); + eld->monitor_present = false; size = snd_hdac_acomp_get_eld(&codec->bus->core, per_pin->pin_nid, &eld->monitor_present, eld->eld_buffer, ELD_MAX_SIZE); - if (size < 0) - goto unlock; if (size > 0) { size = min(size, ELD_MAX_SIZE); if (snd_hdmi_parse_eld(codec, &eld->info, Patches currently in stable-queue which might be from tiwai@xxxxxxx are queue-4.5/alsa-hda-apply-reboot-d3-fix-for-cx20724-codec-too.patch queue-4.5/alsa-intel8x0-add-clock-quirk-entry-for-ad1981b-on-ibm-thinkpad-x41.patch queue-4.5/alsa-hda-add-new-gpu-codec-id-0x10de0082-to-snd-hda.patch queue-4.5/alsa-hda-limit-i915-hdmi-binding-only-for-hsw-and-later.patch queue-4.5/alsa-hda-fix-unexpected-resume-through-regmap-code-path.patch queue-4.5/alsa-hda-fix-missing-eld-update-at-unplugging.patch queue-4.5/alsa-hda-really-restrict-i915-notifier-to-hsw.patch queue-4.5/alsa-usb-audio-add-microsoft-hd-5001-to-quirks.patch queue-4.5/alsa-hda-workaround-for-unbalanced-i915-power-refcount-by-concurrent-probe.patch queue-4.5/alsa-usb-audio-fix-null-dereference-in-create_fixed_stream_quirk.patch queue-4.5/alsa-hda-fix-spurious-kernel-warning-on-baytrail-hdmi.patch queue-4.5/alsa-usb-audio-minor-code-cleanup-in-create_fixed_stream_quirk.patch queue-4.5/alsa-pcm-avoid-bug-string-for-warnings-again.patch queue-4.5/alsa-usb-audio-fix-double-free-in-error-paths-after-snd_usb_add_audio_stream-call.patch queue-4.5/alsa-hda-fix-unconditional-gpio-toggle-via-automute.patch queue-4.5/alsa-hda-don-t-handle-eld-notify-from-invalid-port.patch queue-4.5/alsa-usb-audio-add-sanity-checks-for-endpoint-accesses.patch queue-4.5/alsa-hda-fix-the-mic-mute-button-and-led-problem-for-a-lenovo-aio.patch queue-4.5/alsa-hda-fix-forgotten-hdmi-monitor_present-update.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html