ALSA: VIA HDA: Get codec's type in via_new_spec() function

PATCH In review Lydia Wang 1 participant 1 message Mar 21, 2011 Sound

lore

Share & tools

lore

Lydia Wang

author

2011-03-21 07:34 UTC #0 lore raw

PATCH 12/16 ALSA: VIA HDA: Get codec's type in via_new_spec() function

From: Lydia Wang <[email protected]>
Subject: ALSA: VIA HDA: Get codec's type in via_new_spec() function.

Add get_codec_type() in via_new_spec() function to make sure getting correct codec type before building mixer controls.

Signed-off-by Lydia Wang <[email protected]>

 sound/pci/hda/patch_via.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

sound/pci/hda/patch_via.c +5 -4

@@ -163,6 +163,7 @@
 #endif
 };
 
+static enum VIA_HDA_CODEC get_codec_type(struct hda_codec *codec);
 static struct via_spec * via_new_spec(struct hda_codec *codec)
 {
 	struct via_spec *spec;

@@ -173,6 +174,10 @@
 
 	codec->spec = spec;
 	spec->codec = codec;
+	spec->codec_type = get_codec_type(codec);
+	/* VT1708BCE & VT1708S are almost same */
+	if (spec->codec_type == VT1708BCE)
+		spec->codec_type = VT1708S;
 	return spec;
 }

@@ -1768,10 +1773,6 @@
 	for (i = 0; i < spec->num_iverbs; i++)
 		snd_hda_sequence_write(codec, spec->init_verbs[i]);
 
-	spec->codec_type = get_codec_type(codec);
-	if (spec->codec_type == VT1708BCE)
-		spec->codec_type = VT1708S; /* VT1708BCE & VT1708S are almost
-					       same */
 	/* Lydia Add for EAPD enable */
 	if (!spec->dig_in_nid) { /* No Digital In connection */
 		if (spec->dig_in_pin) {