diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-11 18:07:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-12 07:45:47 +0100 |
| commit | 6661702f2e803b55b50cc0471eb6b9254e99eef2 (patch) | |
| tree | 7606ae2af3e4afa638928a26c517dcbeb57192b6 /sound/pci | |
| parent | ALSA: hda - Add support for multiple headphone/speaker controls for Realtek (diff) | |
| download | linux-6661702f2e803b55b50cc0471eb6b9254e99eef2.tar.xz linux-6661702f2e803b55b50cc0471eb6b9254e99eef2.zip | |
ALSA: hda - Don't refer ELD when unplugged
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>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index d1b1b5796c98..27e8597f66ad 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) |