diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-08-25 10:07:08 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-08-25 10:07:08 -0400 |
commit | 23112d6d2d9b265c959ecb671366c7c3b9c83611 (patch) | |
tree | 9f5edef13165fb4cf32dc12327d1bd911811f218 | |
parent | cb162b6bf2f445d67a45f5485d4ce32addaf8fe0 (diff) |
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>
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 07fbf7db69e3..00ed1268f274 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -6017,7 +6017,14 @@ static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec, | |||
6017 | 6017 | ||
6018 | nid = cfg->line_out_pins[0]; | 6018 | nid = cfg->line_out_pins[0]; |
6019 | if (nid) { | 6019 | if (nid) { |
6020 | err = alc260_add_playback_controls(spec, nid, "Front", &vols); | 6020 | const char *pfx; |
6021 | if (!cfg->speaker_pins[0] && !cfg->hp_pins[0]) | ||
6022 | pfx = "Master"; | ||
6023 | else if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT) | ||
6024 | pfx = "Speaker"; | ||
6025 | else | ||
6026 | pfx = "Front"; | ||
6027 | err = alc260_add_playback_controls(spec, nid, pfx, &vols); | ||
6021 | if (err < 0) | 6028 | if (err < 0) |
6022 | return err; | 6029 | return err; |
6023 | } | 6030 | } |