1 files changed, 15 insertions, 5 deletions

diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index 7ca66d654148..93d7499350c6 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -399,7 +399,10 @@ static void print_conn_list(struct snd_info_buffer *buffer,
 {
         int c, curr = -1;
 
-        if (conn_len > 1 && wid_type != AC_WID_AUD_MIX)
+        if (conn_len > 1 &&
+            wid_type != AC_WID_AUD_MIX &&
+            wid_type != AC_WID_VOL_KNB &&
+            wid_type != AC_WID_POWER)
                 curr = snd_hda_codec_read(codec, nid, 0,
                                           AC_VERB_GET_CONNECT_SEL, 0);
         snd_iprintf(buffer, "  Connection: %d\n", conn_len);
@@ -466,8 +469,9 @@ static void print_codec_info(struct snd_info_entry *entry,
         snd_iprintf(buffer, "Codec: %s\n",
                     codec->name ? codec->name : "Not Set");
         snd_iprintf(buffer, "Address: %d\n", codec->addr);
-        snd_iprintf(buffer, "Vendor Id: 0x%x\n", codec->vendor_id);
-        snd_iprintf(buffer, "Subsystem Id: 0x%x\n", codec->subsystem_id);
+        snd_iprintf(buffer, "Function Id: 0x%x\n", codec->function_id);
+        snd_iprintf(buffer, "Vendor Id: 0x%08x\n", codec->vendor_id);
+        snd_iprintf(buffer, "Subsystem Id: 0x%08x\n", codec->subsystem_id);
         snd_iprintf(buffer, "Revision Id: 0x%x\n", codec->revision_id);
 
         if (codec->mfg)
@@ -553,8 +557,14 @@ static void print_codec_info(struct snd_info_entry *entry,
                         snd_iprintf(buffer, "  Amp-Out caps: ");
                         print_amp_caps(buffer, codec, nid, HDA_OUTPUT);
                         snd_iprintf(buffer, "  Amp-Out vals: ");
-                        print_amp_vals(buffer, codec, nid, HDA_OUTPUT,
-                                       wid_caps & AC_WCAP_STEREO, 1);
+                        if (wid_type == AC_WID_PIN &&
+                            codec->pin_amp_workaround)
+                                print_amp_vals(buffer, codec, nid, HDA_OUTPUT,
+                                               wid_caps & AC_WCAP_STEREO,
+                                               conn_len);
+                        else
+                                print_amp_vals(buffer, codec, nid, HDA_OUTPUT,
+                                               wid_caps & AC_WCAP_STEREO, 1);
                 }
 
                 switch (wid_type) {