diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-10 12:02:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-12 07:33:32 -0700 |
| commit | f3e8a9206c6fd6932c79a120de6f8373ccd6b9c6 (patch) | |
| tree | b616c68a0b142ce4471bf236cc3288faf3bb554e /sound/pci | |
| parent | 3c49e7be596c2b4e46f4e68d41efdf59f0522f96 (diff) | |
| download | lwn-f3e8a9206c6fd6932c79a120de6f8373ccd6b9c6.tar.gz lwn-f3e8a9206c6fd6932c79a120de6f8373ccd6b9c6.zip | |
ALSA: hda - Don't handle ELD notify from invalid port
commit 4f8e4f3537cafc4de128e6bfdf83baa78bc60eb1 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: Stefan Assmann <sassmann@kpanic.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index bcbc4ee10130..b90e4f3967de 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2432,6 +2432,10 @@ static void intel_pin_eld_notify(void *audio_ptr, int port) struct hda_codec *codec = audio_ptr; 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); * the state will be updated at resume */ |