UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2009-08-25 16:07:08 +02:00
parent cb162b6bf2
commit 23112d6d2d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/pci/hda/patch_realtek.c
View File

@ -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;
} }