1 files changed, 25 insertions, 10 deletions

diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index 045e5d32f5de..0fee8fae590a 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
@@ -138,16 +139,17 @@ static void print_amp_vals(struct snd_info_buffer *buffer,
         dir = dir == HDA_OUTPUT ? AC_AMP_GET_OUTPUT : AC_AMP_GET_INPUT;
         for (i = 0; i < indices; i++) {
                 snd_iprintf(buffer, " [");
+                val = snd_hda_codec_read(codec, nid, 0,
+                                         AC_VERB_GET_AMP_GAIN_MUTE,
+                                         AC_AMP_GET_LEFT | dir | i);
+                snd_iprintf(buffer, "0x%02x", val);
                 if (stereo) {
                         val = snd_hda_codec_read(codec, nid, 0,
                                                  AC_VERB_GET_AMP_GAIN_MUTE,
-                                                 AC_AMP_GET_LEFT | dir | i);
-                        snd_iprintf(buffer, "0x%02x ", val);
+                                                 AC_AMP_GET_RIGHT | dir | i);
+                        snd_iprintf(buffer, " 0x%02x", val);
                 }
-                val = snd_hda_codec_read(codec, nid, 0,
-                                         AC_VERB_GET_AMP_GAIN_MUTE,
-                                         AC_AMP_GET_RIGHT | dir | i);
-                snd_iprintf(buffer, "0x%02x]", val);
+                snd_iprintf(buffer, "]");
         }
         snd_iprintf(buffer, "\n");
 }
@@ -603,6 +605,8 @@ static void print_codec_info(struct snd_info_entry *entry,
         print_amp_caps(buffer, codec, codec->afg, HDA_INPUT);
         snd_iprintf(buffer, "Default Amp-Out caps: ");
         print_amp_caps(buffer, codec, codec->afg, HDA_OUTPUT);
+        snd_iprintf(buffer, "State of AFG node 0x%02x:\n", codec->afg);
+        print_power_state(buffer, codec, codec->afg);
 
         nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid);
         if (! nid || nodes < 0) {
@@ -620,7 +624,7 @@ static void print_codec_info(struct snd_info_entry *entry,
                         snd_hda_param_read(codec, nid,
                                            AC_PAR_AUDIO_WIDGET_CAP);
                 unsigned int wid_type = get_wcaps_type(wid_caps);
-                hda_nid_t conn[HDA_MAX_CONNECTIONS];
+                hda_nid_t *conn = NULL;
                 int conn_len = 0;
 
                 snd_iprintf(buffer, "Node 0x%02x [%s] wcaps 0x%x:", nid,
@@ -657,9 +661,18 @@ static void print_codec_info(struct snd_info_entry *entry,
                 if (wid_type == AC_WID_VOL_KNB)
                         wid_caps |= AC_WCAP_CONN_LIST;
 
-                if (wid_caps & AC_WCAP_CONN_LIST)
-                        conn_len = snd_hda_get_raw_connections(codec, nid, conn,
-                                                           HDA_MAX_CONNECTIONS);
+                if (wid_caps & AC_WCAP_CONN_LIST) {
+                        conn_len = snd_hda_get_num_raw_conns(codec, nid);
+                        if (conn_len > 0) {
+                                conn = kmalloc(sizeof(hda_nid_t) * conn_len,
+                                               GFP_KERNEL);
+                                if (!conn)
+                                        return;
+                                if (snd_hda_get_raw_connections(codec, nid, conn,
+                                                                conn_len) < 0)
+                                        conn_len = 0;
+                        }
+                }
 
                 if (wid_caps & AC_WCAP_IN_AMP) {
                         snd_iprintf(buffer, "  Amp-In caps: ");
@@ -732,6 +745,8 @@ static void print_codec_info(struct snd_info_entry *entry,
 
                 if (codec->proc_widget_hook)
                         codec->proc_widget_hook(buffer, codec, nid);
+
+                kfree(conn);
         }
         snd_hda_power_down(codec);
 }