summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-11 18:07:14 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 15:14:04 -0800
commitfada8d6ae6993a823ed022982e65445a26eb53bd (patch)
treea24153fa1f80a33b08a96951541567ebe8c1ac80 /sound
parentbcd5d2de2728ae252c3dae3c7cce46fd45a4ec5c (diff)
ALSA: hda - Don't refer ELD when unplugged
commit 6661702f2e803b55b50cc0471eb6b9254e99eef2 upstream. When unplugged, we shouldn't refer to ELD information for PCM open any more. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_hdmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 31df7747990d..02b7ef640700 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -827,7 +827,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
*codec_pars = *hinfo;
eld = &spec->sink_eld[idx];
- if (eld->sad_count > 0) {
+ if (eld->eld_valid && eld->sad_count > 0) {
hdmi_eld_update_pcm_info(eld, hinfo, codec_pars);
if (hinfo->channels_min > hinfo->channels_max ||
!hinfo->rates || !hinfo->formats)