aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-16 12:47:56 -0400
committerTakashi Iwai <tiwai@suse.de>2010-09-16 12:47:56 -0400
commit30ea098fc000bb05081a1999269658f1a88af36a (patch)
tree67d006cefe4a4a28e40231b405b6fd392dff721f /sound/pci
parent5855fb8076e784a657bc2441cd29f166c7c1ea8c (diff)
ALSA: hda - Fix input-pin setup for Realtek codecs
Through the transition of autocfg to individual inputs array, I forgot to rewrite the argument passed to alc_set_input_pin(). This resulted in wrongly setup input pins. Fixed now. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 945826da23b6..5df88798895b 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5160,7 +5160,7 @@ static void alc880_auto_init_analog_input(struct hda_codec *codec)
5160 for (i = 0; i < cfg->num_inputs; i++) { 5160 for (i = 0; i < cfg->num_inputs; i++) {
5161 hda_nid_t nid = cfg->inputs[i].pin; 5161 hda_nid_t nid = cfg->inputs[i].pin;
5162 if (alc_is_input_pin(codec, nid)) { 5162 if (alc_is_input_pin(codec, nid)) {
5163 alc_set_input_pin(codec, nid, i); 5163 alc_set_input_pin(codec, nid, cfg->inputs[i].type);
5164 if (nid != ALC880_PIN_CD_NID && 5164 if (nid != ALC880_PIN_CD_NID &&
5165 (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)) 5165 (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
5166 snd_hda_codec_write(codec, nid, 0, 5166 snd_hda_codec_write(codec, nid, 0,
@@ -6793,7 +6793,7 @@ static void alc260_auto_init_analog_input(struct hda_codec *codec)
6793 for (i = 0; i < cfg->num_inputs; i++) { 6793 for (i = 0; i < cfg->num_inputs; i++) {
6794 hda_nid_t nid = cfg->inputs[i].pin; 6794 hda_nid_t nid = cfg->inputs[i].pin;
6795 if (nid >= 0x12) { 6795 if (nid >= 0x12) {
6796 alc_set_input_pin(codec, nid, i); 6796 alc_set_input_pin(codec, nid, cfg->inputs[i].type);
6797 if (nid != ALC260_PIN_CD_NID && 6797 if (nid != ALC260_PIN_CD_NID &&
6798 (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)) 6798 (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
6799 snd_hda_codec_write(codec, nid, 0, 6799 snd_hda_codec_write(codec, nid, 0,
@@ -10664,7 +10664,7 @@ static void alc882_auto_init_analog_input(struct hda_codec *codec)
10664 10664
10665 for (i = 0; i < cfg->num_inputs; i++) { 10665 for (i = 0; i < cfg->num_inputs; i++) {
10666 hda_nid_t nid = cfg->inputs[i].pin; 10666 hda_nid_t nid = cfg->inputs[i].pin;
10667 alc_set_input_pin(codec, nid, i); 10667 alc_set_input_pin(codec, nid, cfg->inputs[i].type);
10668 if (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP) 10668 if (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)
10669 snd_hda_codec_write(codec, nid, 0, 10669 snd_hda_codec_write(codec, nid, 0,
10670 AC_VERB_SET_AMP_GAIN_MUTE, 10670 AC_VERB_SET_AMP_GAIN_MUTE,
@@ -15856,7 +15856,7 @@ static void alc861_auto_init_analog_input(struct hda_codec *codec)
15856 for (i = 0; i < cfg->num_inputs; i++) { 15856 for (i = 0; i < cfg->num_inputs; i++) {
15857 hda_nid_t nid = cfg->inputs[i].pin; 15857 hda_nid_t nid = cfg->inputs[i].pin;
15858 if (nid >= 0x0c && nid <= 0x11) 15858 if (nid >= 0x0c && nid <= 0x11)
15859 alc_set_input_pin(codec, nid, i); 15859 alc_set_input_pin(codec, nid, cfg->inputs[i].type);
15860 } 15860 }
15861} 15861}
15862 15862
@@ -16849,7 +16849,7 @@ static void alc861vd_auto_init_analog_input(struct hda_codec *codec)
16849 for (i = 0; i < cfg->num_inputs; i++) { 16849 for (i = 0; i < cfg->num_inputs; i++) {
16850 hda_nid_t nid = cfg->inputs[i].pin; 16850 hda_nid_t nid = cfg->inputs[i].pin;
16851 if (alc_is_input_pin(codec, nid)) { 16851 if (alc_is_input_pin(codec, nid)) {
16852 alc_set_input_pin(codec, nid, i); 16852 alc_set_input_pin(codec, nid, cfg->inputs[i].type);
16853 if (nid != ALC861VD_PIN_CD_NID && 16853 if (nid != ALC861VD_PIN_CD_NID &&
16854 (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)) 16854 (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
16855 snd_hda_codec_write(codec, nid, 0, 16855 snd_hda_codec_write(codec, nid, 0,
@@ -19086,7 +19086,7 @@ static void alc662_auto_init_analog_input(struct hda_codec *codec)
19086 for (i = 0; i < cfg->num_inputs; i++) { 19086 for (i = 0; i < cfg->num_inputs; i++) {
19087 hda_nid_t nid = cfg->inputs[i].pin; 19087 hda_nid_t nid = cfg->inputs[i].pin;
19088 if (alc_is_input_pin(codec, nid)) { 19088 if (alc_is_input_pin(codec, nid)) {
19089 alc_set_input_pin(codec, nid, i); 19089 alc_set_input_pin(codec, nid, cfg->inputs[i].type);
19090 if (nid != ALC662_PIN_CD_NID && 19090 if (nid != ALC662_PIN_CD_NID &&
19091 (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)) 19091 (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
19092 snd_hda_codec_write(codec, nid, 0, 19092 snd_hda_codec_write(codec, nid, 0,