Skip to content

L
linux
Commit 2e925dde authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: hda - Use alc_get_pfx_name() for all Realtek codecs 

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6843ca16
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 14 deletions
sound/pci/hda/patch_realtek.c
View file @ 2e925dde
...@@ -7184,12 +7184,8 @@ static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec, ...@@ -7184,12 +7184,8 @@ static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec,
nid = cfg->line_out_pins[0]; nid = cfg->line_out_pins[0];
if (nid) { if (nid) {
const char *pfx; const char *pfx;
if (!cfg->speaker_pins[0] && !cfg->hp_pins[0]) int index;
pfx = "Master"; pfx = alc_get_line_out_pfx(spec, 0, true, &index);
else if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
pfx = "Speaker";
else
pfx = "Front";
err = alc260_add_playback_controls(spec, nid, pfx, &vols); err = alc260_add_playback_controls(spec, nid, pfx, &vols);
if (err < 0) if (err < 0)
return err; return err;
...@@ -13639,10 +13635,8 @@ static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec, ...@@ -13639,10 +13635,8 @@ static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec,
nid = cfg->line_out_pins[0]; nid = cfg->line_out_pins[0];
if (nid) { if (nid) {
const char *name; const char *name;
if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT) int index;
name = "Speaker"; name = alc_get_line_out_pfx(spec, 0, true, &index);
else
name = "Front";
err = alc268_new_analog_output(spec, nid, name, 0); err = alc268_new_analog_output(spec, nid, name, 0);
if (err < 0) if (err < 0)
return err; return err;
...@@ -19871,10 +19865,8 @@ static int alc680_auto_create_multi_out_ctls(struct alc_spec *spec, ...@@ -19871,10 +19865,8 @@ static int alc680_auto_create_multi_out_ctls(struct alc_spec *spec,
nid = cfg->line_out_pins[0]; nid = cfg->line_out_pins[0];
if (nid) { if (nid) {
const char *name; const char *name;
if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT) int index;
name = "Speaker"; name = alc_get_line_out_pfx(spec, 0, true, &index);
else
name = "Front";
err = alc680_new_analog_output(spec, nid, name, 0); err = alc680_new_analog_output(spec, nid, name, 0);
if (err < 0) if (err < 0)
return err; return err;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7