aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_intelhdmi.c
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2009-11-18 12:38:01 +0800
committerTakashi Iwai <tiwai@suse.de>2009-11-18 07:37:49 +0100
commit23ccc2bd246a5bdb1ac03dc9040a0585c1890ef3 (patch)
treecbe53b086f16a4009378264bb16fabc5243cec16 /sound/pci/hda/patch_intelhdmi.c
parent1e7c10fefadb42d9300305c7de57bea365855e9b (diff)
ALSA: intelhdmi - export monitor-presence and ELD-valid status
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_intelhdmi.c')
-rw-r--r--sound/pci/hda/patch_intelhdmi.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
index 82312c67f8d..095c993f4b7 100644
--- a/sound/pci/hda/patch_intelhdmi.c
+++ b/sound/pci/hda/patch_intelhdmi.c
@@ -62,8 +62,6 @@ struct intel_hdmi_spec {
/*
* HDMI sink attached to each pin
*/
- bool sink_present[INTEL_HDMI_PINS];
- bool sink_eldv[INTEL_HDMI_PINS];
struct hdmi_eld sink_eld[INTEL_HDMI_PINS];
/*
@@ -645,7 +643,7 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, hda_nid_t nid,
for (i = 0; i < spec->num_pins; i++) {
if (spec->pin_cvt[i] != nid)
continue;
- if (spec->sink_present[i] != true)
+ if (!spec->sink_eld[i].monitor_present)
continue;
pin_nid = spec->pin[i];
@@ -675,8 +673,8 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
if (index < 0)
return;
- spec->sink_present[index] = pind;
- spec->sink_eldv[index] = eldv;
+ spec->sink_eld[index].monitor_present = pind;
+ spec->sink_eld[index].eld_valid = eldv;
if (pind && eldv) {
hdmi_parse_eld(codec, index);