ALSA: hda - Don't refer ELD when unplugged
authorTakashi Iwai <tiwai@suse.de>
Tue, 11 Jan 2011 17:07:14 +0000 (18:07 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 12 Jan 2011 06:45:47 +0000 (07:45 +0100)
When unplugged, we shouldn't refer to ELD information for PCM open
any more.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: <stable@kernel.org>
sound/pci/hda/patch_hdmi.c

index d1b1b5796c98ef0343188600da07c41befb48c7b..27e8597f66ada33629e63d04d7e5ea93cb309acd 100644 (file)
@@ -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)