diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2016-03-21 16:07:30 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-21 16:25:07 +0100 |
| commit | c64c1437afb14ebc900e40910f31ffb20bf652ad (patch) | |
| tree | b5b7158997bb678910a52fa6d84d49adffba2f15 /sound/pci | |
| parent | ALSA: usb-audio: add Microsoft HD-5001 to quirks (diff) | |
| download | linux-dev-c64c1437afb14ebc900e40910f31ffb20bf652ad.tar.xz linux-dev-c64c1437afb14ebc900e40910f31ffb20bf652ad.zip | |
ALSA: hda - Fix missing ELD update at unplugging
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@linux.intel.com>
Cc: <stable@vger.kernel.org> # v4.5
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 7ae614d27954..5af372d01834 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1484,11 +1484,10 @@ static void sync_eld_via_acomp(struct hda_codec *codec, 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, |