From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 22 Feb 2008 17:46:00 +0000 (+0100)
Subject: [ALSA] hda-codec - Fix amp-in values for pin widgets
X-Git-Tag: v2.6.25-rc3~76
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9e03ad7907bc9c9e60a3ea09579a61ad7f9e59c8;p=linux-2.6-omap-h63xx.git

[ALSA] hda-codec - Fix amp-in values for pin widgets

Pin widgets have always one amp-input value regardless of number of
connections.  The proc file showed values wrongly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index 35a630d1770..5633f77f8f3 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -584,7 +584,8 @@ static void print_codec_info(struct snd_info_entry *entry,
 			print_amp_caps(buffer, codec, nid, HDA_INPUT);
 			snd_iprintf(buffer, "  Amp-In vals: ");
 			print_amp_vals(buffer, codec, nid, HDA_INPUT,
-				       wid_caps & AC_WCAP_STEREO, conn_len);
+				       wid_caps & AC_WCAP_STEREO,
+				       wid_type == AC_WID_PIN ? 1 : conn_len);
 		}
 		if (wid_caps & AC_WCAP_OUT_AMP) {
 			snd_iprintf(buffer, "  Amp-Out caps: ");