1 files changed, 19 insertions, 5 deletions

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 1e6c489bca15..0b2a26e2c5f1 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -2524,18 +2524,32 @@ static int intel_pin2port(void *audio_ptr, int pin_nid)
         return -1;
 }
 
+static int intel_port2pin(struct hda_codec *codec, int port)
+{
+        struct hdmi_spec *spec = codec->spec;
+
+        if (!spec->port_num) {
+                /* we assume only from port-B to port-D */
+                if (port < 1 || port > 3)
+                        return 0;
+                /* intel port is 1-based */
+                return port + intel_base_nid(codec) - 1;
+        }
+
+        if (port < 1 || port > spec->port_num)
+                return 0;
+        return spec->port_map[port - 1];
+}
+
 static void intel_pin_eld_notify(void *audio_ptr, int port, int pipe)
 {
         struct hda_codec *codec = audio_ptr;
         int pin_nid;
         int dev_id = pipe;
 
-        /* we assume only from port-B to port-D */
-        if (port < 1 || port > 3)
+        pin_nid = intel_port2pin(codec, port);
+        if (!pin_nid)
                 return;
-
-        pin_nid = port + intel_base_nid(codec) - 1; /* intel port is 1-based */
-
         /* skip notification during system suspend (but not in runtime PM);
          * the state will be updated at resume
          */