diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-09-16 08:29:04 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-09-16 08:29:04 +0200 |
commit | 0308110615acb4b6409fe042caf22bb9fb075d85 (patch) | |
tree | d129f11ebdbe49b21246a72e6ba52c50e81e8e7e /sound/pci/hda/hda_codec.c | |
parent | c731bc96ad641a5fa3d50a87b474652505507282 (diff) | |
parent | 763437a9e7737535b2fc72175ad4974048769be6 (diff) | |
download | op-kernel-dev-0308110615acb4b6409fe042caf22bb9fb075d85.zip op-kernel-dev-0308110615acb4b6409fe042caf22bb9fb075d85.tar.gz |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 3e7850c..f3aefef 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); |