From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 30 Aug 2010 11:05:08 +0000 (+0200)
Subject: ALSA: hda - Use new inputs[] field to parse input-pins for CA-IBG codecs
X-Git-Tag: v2.6.37-rc1~126^2^2~70
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=fa4968a8b231816d161583e604a9f972e5713f17;p=net-next-2.6.git

ALSA: hda - Use new inputs[] field to parse input-pins for CA-IBG codecs

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c
index af478019088..42b3fb4cafc 100644
--- a/sound/pci/hda/patch_ca0110.c
+++ b/sound/pci/hda/patch_ca0110.c
@@ -468,13 +468,14 @@ static void parse_input(struct hda_codec *codec)
 			spec->dig_in = nid;
 			continue;
 		}
-		for (j = 0; j < AUTO_PIN_LAST; j++)
-			if (cfg->input_pins[j] == pin)
+		for (j = 0; j < cfg->num_inputs; j++)
+			if (cfg->inputs[j].pin == pin)
 				break;
-		if (j >= AUTO_PIN_LAST)
+		if (j >= cfg->num_inputs)
 			continue;
 		spec->input_pins[n] = pin;
-		spec->input_labels[n] = auto_pin_cfg_labels[j];
+		spec->input_labels[n] =
+			auto_pin_cfg_labels[cfg->inputs[j].type];
 		spec->adcs[n] = nid;
 		n++;
 	}