diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-09 10:05:53 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-09 10:05:53 +0200 |
| commit | 84f3b6dab973c1a9e941fdd1a55caa44da6d9882 (patch) | |
| tree | 75105af06069087a480c1f69e4e2916718e623e6 /sound/pci/hda/patch_sigmatel.c | |
| parent | 664cee46e755b37204f1731cb8726db610f3486d (diff) | |
| parent | cd9abc7a22806f2340b853058a634b0e32a9f47c (diff) | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 05fcd60cc46..a2f57e3581e 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -3408,6 +3408,9 @@ static int get_connection_index(struct hda_codec *codec, hda_nid_t mux, hda_nid_t conn[HDA_MAX_NUM_INPUTS]; int i, nums; + if (!(get_wcaps(codec, mux) & AC_WCAP_CONN_LIST)) + return -1; + nums = snd_hda_get_connections(codec, mux, conn, ARRAY_SIZE(conn)); for (i = 0; i < nums; i++) if (conn[i] == nid) |