Commit 23112d6d authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Improve auto-cfg mixer name for ALC260

Instead of fixed "Front" mixer name, try to assign a better name, e.g.
"Master" or "Speaker" fot the primary output volume controls of ALC260
codec.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent cb162b6b
...@@ -6017,7 +6017,14 @@ static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec, ...@@ -6017,7 +6017,14 @@ 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) {
err = alc260_add_playback_controls(spec, nid, "Front", &vols); const char *pfx;
if (!cfg->speaker_pins[0] && !cfg->hp_pins[0])
pfx = "Master";
else if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
pfx = "Speaker";
else
pfx = "Front";
err = alc260_add_playback_controls(spec, nid, pfx, &vols);
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