diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-14 08:23:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-14 08:23:07 +0100 |
| commit | cdcb61a78f8d4f880a2dc1154ddfb6a05b47c092 (patch) | |
| tree | faf9d15b721ab30feeac041e78fada1b17a95c35 /sound/pci/hda/patch_hdmi.c | |
| parent | 0ab1ace856205d10cbc1924b2d931c01ffd216a6 (diff) | |
| parent | 6ef2f68fa38bf415830f67903d87180d933e0f47 (diff) | |
| download | linux-cdcb61a78f8d4f880a2dc1154ddfb6a05b47c092.tar.bz2 | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
| -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 eb7da9992aad..4447aa57c42c 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2208,6 +2208,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 */ |