Skip to content

Commit

Permalink
ALSA: hda - Get rid of AMD HDMI exception in hdmi_present_sense()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai committed Nov 7, 2013
1 parent 512a4cb commit aff747e
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions sound/pci/hda/patch_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit aff747e

Please sign in to comment.