aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_realtek.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r--sound/pci/hda/patch_realtek.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index ba9e050e2012..d08d2e399c8f 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2753,7 +2753,7 @@ static void alc880_auto_init_extra_out(struct hda_codec *codec)
2753 pin = spec->autocfg.speaker_pins[0]; 2753 pin = spec->autocfg.speaker_pins[0];
2754 if (pin) /* connect to front */ 2754 if (pin) /* connect to front */
2755 alc880_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0); 2755 alc880_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
2756 pin = spec->autocfg.hp_pin; 2756 pin = spec->autocfg.hp_pins[0];
2757 if (pin) /* connect to front */ 2757 if (pin) /* connect to front */
2758 alc880_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); 2758 alc880_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
2759} 2759}
@@ -2794,7 +2794,7 @@ static int alc880_parse_auto_config(struct hda_codec *codec)
2794 (err = alc880_auto_create_extra_out(spec, 2794 (err = alc880_auto_create_extra_out(spec,
2795 spec->autocfg.speaker_pins[0], 2795 spec->autocfg.speaker_pins[0],
2796 "Speaker")) < 0 || 2796 "Speaker")) < 0 ||
2797 (err = alc880_auto_create_extra_out(spec, spec->autocfg.hp_pin, 2797 (err = alc880_auto_create_extra_out(spec, spec->autocfg.hp_pins[0],
2798 "Headphone")) < 0 || 2798 "Headphone")) < 0 ||
2799 (err = alc880_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0) 2799 (err = alc880_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
2800 return err; 2800 return err;
@@ -3736,7 +3736,7 @@ static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec,
3736 return err; 3736 return err;
3737 } 3737 }
3738 3738
3739 nid = cfg->hp_pin; 3739 nid = cfg->hp_pins[0];
3740 if (nid) { 3740 if (nid) {
3741 err = alc260_add_playback_controls(spec, nid, "Headphone"); 3741 err = alc260_add_playback_controls(spec, nid, "Headphone");
3742 if (err < 0) 3742 if (err < 0)
@@ -3806,7 +3806,7 @@ static void alc260_auto_init_multi_out(struct hda_codec *codec)
3806 if (nid) 3806 if (nid)
3807 alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0); 3807 alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
3808 3808
3809 nid = spec->autocfg.hp_pin; 3809 nid = spec->autocfg.hp_pins[0];
3810 if (nid) 3810 if (nid)
3811 alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0); 3811 alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
3812} 3812}
@@ -4526,7 +4526,7 @@ static void alc882_auto_init_hp_out(struct hda_codec *codec)
4526 struct alc_spec *spec = codec->spec; 4526 struct alc_spec *spec = codec->spec;
4527 hda_nid_t pin; 4527 hda_nid_t pin;
4528 4528
4529 pin = spec->autocfg.hp_pin; 4529 pin = spec->autocfg.hp_pins[0];
4530 if (pin) /* connect to front */ 4530 if (pin) /* connect to front */
4531 alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); /* use dac 0 */ 4531 alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); /* use dac 0 */
4532} 4532}
@@ -5207,7 +5207,7 @@ static void alc883_auto_init_hp_out(struct hda_codec *codec)
5207 struct alc_spec *spec = codec->spec; 5207 struct alc_spec *spec = codec->spec;
5208 hda_nid_t pin; 5208 hda_nid_t pin;
5209 5209
5210 pin = spec->autocfg.hp_pin; 5210 pin = spec->autocfg.hp_pins[0];
5211 if (pin) /* connect to front */ 5211 if (pin) /* connect to front */
5212 /* use dac 0 */ 5212 /* use dac 0 */
5213 alc883_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); 5213 alc883_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
@@ -5630,7 +5630,7 @@ static int alc262_auto_create_multi_out_ctls(struct alc_spec *spec, const struct
5630 return err; 5630 return err;
5631 } 5631 }
5632 } 5632 }
5633 nid = cfg->hp_pin; 5633 nid = cfg->hp_pins[0];
5634 if (nid) { 5634 if (nid) {
5635 /* spec->multiout.hp_nid = 2; */ 5635 /* spec->multiout.hp_nid = 2; */
5636 if (nid == 0x16) { 5636 if (nid == 0x16) {
@@ -6630,7 +6630,7 @@ static void alc861_auto_init_hp_out(struct hda_codec *codec)
6630 struct alc_spec *spec = codec->spec; 6630 struct alc_spec *spec = codec->spec;
6631 hda_nid_t pin; 6631 hda_nid_t pin;
6632 6632
6633 pin = spec->autocfg.hp_pin; 6633 pin = spec->autocfg.hp_pins[0];
6634 if (pin) /* connect to front */ 6634 if (pin) /* connect to front */
6635 alc861_auto_set_output_and_unmute(codec, pin, PIN_HP, spec->multiout.dac_nids[0]); 6635 alc861_auto_set_output_and_unmute(codec, pin, PIN_HP, spec->multiout.dac_nids[0]);
6636} 6636}
@@ -6665,7 +6665,7 @@ static int alc861_parse_auto_config(struct hda_codec *codec)
6665 6665
6666 if ((err = alc861_auto_fill_dac_nids(spec, &spec->autocfg)) < 0 || 6666 if ((err = alc861_auto_fill_dac_nids(spec, &spec->autocfg)) < 0 ||
6667 (err = alc861_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 || 6667 (err = alc861_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
6668 (err = alc861_auto_create_hp_ctls(spec, spec->autocfg.hp_pin)) < 0 || 6668 (err = alc861_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0])) < 0 ||
6669 (err = alc861_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0) 6669 (err = alc861_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
6670 return err; 6670 return err;
6671 6671