diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-11-07 16:39:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-11-07 16:39:37 +0100 |
| commit | aff747ebbf68c6efc4d091d54058af89b916f82d (patch) | |
| tree | eadf9a9b323a8760c3f186d60b922ee352fed639 /sound/pci | |
| parent | 512a4cb9e7285e6ef8104da808dc85806321aec8 (diff) | |
| download | linux-stable-aff747ebbf68c6efc4d091d54058af89b916f82d.tar.gz linux-stable-aff747ebbf68c6efc4d091d54058af89b916f82d.tar.bz2 linux-stable-aff747ebbf68c6efc4d091d54058af89b916f82d.zip | |
ALSA: hda - Get rid of AMD HDMI exception in hdmi_present_sense()
Since the recent fake ELD patches, we can remove the check for AMD
HDMI in hdmi_present_sense() and decide the return value from
eld_valid value.
Suggested by Anssi Hannula.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index a96403a828af..e68792311bb2 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1561,10 +1561,7 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) SNDRV_CTL_EVENT_MASK_VALUE | SNDRV_CTL_EVENT_MASK_INFO, &per_pin->eld_ctl->id); unlock: - if ((codec->vendor_id & 0xffff0000) == 0x10020000) - ret = true; /* AMD codecs create ELD by itself */ - else - ret = !repoll || !pin_eld->monitor_present || pin_eld->eld_valid; + ret = !repoll || !pin_eld->monitor_present || pin_eld->eld_valid; jack = snd_hda_jack_tbl_get(codec, pin_nid); if (jack) |