Commit ee2a37ab authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman

ALSA: hda - Don't handle ELD notify from invalid port

commit 4f8e4f35 upstream.

The current Intel HDMI codec driver supports only three fixed ports
from port B to port D.  However, i915 driver may assign a DP on other
ports, e.g. port A, when no eDP is used.  This incompatibility is
caught later at pin_nid_to_pin_index() and results in a warning
message like "HDMI: pin nid 4 not registered" at each time.

This patch filters out such invalid events beforehand, so that the
kernel won't be too grumbling.
Reported-by: default avatarStefan Assmann <sassmann@kpanic.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5fae159b
...@@ -2353,6 +2353,10 @@ static void intel_pin_eld_notify(void *audio_ptr, int port) ...@@ -2353,6 +2353,10 @@ static void intel_pin_eld_notify(void *audio_ptr, int port)
struct hda_codec *codec = audio_ptr; struct hda_codec *codec = audio_ptr;
int pin_nid = port + 0x04; int pin_nid = port + 0x04;
/* we assume only from port-B to port-D */
if (port < 1 || port > 3)
return;
/* skip notification during system suspend (but not in runtime PM); /* skip notification during system suspend (but not in runtime PM);
* the state will be updated at resume * the state will be updated at resume
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment