Commit ac66c28d authored by Lydia Wang's avatar Lydia Wang Committed by Greg Kroah-Hartman

ALSA: hda - VIA: Fix codec type for VT1708BCE at the right timing

commit 0341ccd7 upstream.

Add get_codec_type() in via_new_spec() function to make sure getting
correct codec type before building mixer controls.
Signed-off-by: default avatarLydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9621c276
...@@ -159,6 +159,7 @@ struct via_spec { ...@@ -159,6 +159,7 @@ struct via_spec {
#endif #endif
}; };
static enum VIA_HDA_CODEC get_codec_type(struct hda_codec *codec);
static struct via_spec * via_new_spec(struct hda_codec *codec) static struct via_spec * via_new_spec(struct hda_codec *codec)
{ {
struct via_spec *spec; struct via_spec *spec;
...@@ -169,6 +170,10 @@ static struct via_spec * via_new_spec(struct hda_codec *codec) ...@@ -169,6 +170,10 @@ static struct via_spec * via_new_spec(struct hda_codec *codec)
codec->spec = spec; codec->spec = spec;
spec->codec = codec; 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; return spec;
} }
...@@ -2203,10 +2208,6 @@ static int via_init(struct hda_codec *codec) ...@@ -2203,10 +2208,6 @@ static int via_init(struct hda_codec *codec)
for (i = 0; i < spec->num_iverbs; i++) for (i = 0; i < spec->num_iverbs; i++)
snd_hda_sequence_write(codec, spec->init_verbs[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 */ /* Lydia Add for EAPD enable */
if (!spec->dig_in_nid) { /* No Digital In connection */ if (!spec->dig_in_nid) { /* No Digital In connection */
if (spec->dig_in_pin) { if (spec->dig_in_pin) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment