diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-22 02:43:27 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-22 02:43:27 -0400 |
| commit | 76531d4166fb620375ff3c1ac24753265216d579 (patch) | |
| tree | ed60dc74eda8a16de02f07b14c8036d3dee7a782 /sound/pci/hda/hda_proc.c | |
| parent | 7d339ae99758bc21033d4a19bcd4f7b55f96e24e (diff) | |
| parent | a353fbb17961780c13e585e8658006ef0e543733 (diff) | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_proc.c')
| -rw-r--r-- | sound/pci/hda/hda_proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index bfe74c2fb079..2be57b051aa2 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c | |||
| @@ -636,7 +636,7 @@ static void print_codec_info(struct snd_info_entry *entry, | |||
| 636 | wid_caps |= AC_WCAP_CONN_LIST; | 636 | wid_caps |= AC_WCAP_CONN_LIST; |
| 637 | 637 | ||
| 638 | if (wid_caps & AC_WCAP_CONN_LIST) | 638 | if (wid_caps & AC_WCAP_CONN_LIST) |
| 639 | conn_len = snd_hda_get_connections(codec, nid, conn, | 639 | conn_len = snd_hda_get_raw_connections(codec, nid, conn, |
| 640 | HDA_MAX_CONNECTIONS); | 640 | HDA_MAX_CONNECTIONS); |
| 641 | 641 | ||
| 642 | if (wid_caps & AC_WCAP_IN_AMP) { | 642 | if (wid_caps & AC_WCAP_IN_AMP) { |