Merge remote-tracking branch 'origin/master' into next

(Merge in order to get the PCIe mps/mrss code fixes)

2 files changed, 6 insertions, 2 deletions

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 3e7850c238c3..f3aefef37216 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -579,9 +579,13 @@ int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux,
                 return -1;
         }
         recursive++;
-        for (i = 0; i < nums; i++)
+        for (i = 0; i < nums; i++) {
+                unsigned int type = get_wcaps_type(get_wcaps(codec, conn[i]));
+                if (type == AC_WID_PIN || type == AC_WID_AUD_OUT)
+                        continue;
                 if (snd_hda_get_conn_index(codec, conn[i], nid, recursive) >= 0)
                         return i;
+        }
         return -1;
 }
 EXPORT_SYMBOL_HDA(snd_hda_get_conn_index);
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index d6c93d92b550..c45f3e69bcf0 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -535,7 +535,7 @@ static int add_volume(struct hda_codec *codec, const char *name,
                       int index, unsigned int pval, int dir,
                       struct snd_kcontrol **kctlp)
 {
-        char tmp[32];
+        char tmp[44];
         struct snd_kcontrol_new knew =
                 HDA_CODEC_VOLUME_IDX(tmp, index, 0, 0, HDA_OUTPUT);
         knew.private_value = pval;