ALSA: hda - Get rid of AMD HDMI exception in hdmi_present_sense()
authorTakashi Iwai <tiwai@suse.de>
Thu, 7 Nov 2013 15:39:37 +0000 (16:39 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 7 Nov 2013 15:39:37 +0000 (16:39 +0100)
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>
sound/pci/hda/patch_hdmi.c

index a96403a828af4907228d8e776a50407e40986581..e68792311bb22850eb44ae0be6659ede770a1d06 100644 (file)
@@ -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:
                               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)
 
        jack = snd_hda_jack_tbl_get(codec, pin_nid);
        if (jack)