diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-06-20 08:09:02 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-06-20 10:24:14 -0400 |
commit | 6aadf41d6b9f8da68db5962929c07f816db15893 (patch) | |
tree | a951e8d7d977d3723fafb0ae67732061d9e62362 /sound/pci | |
parent | 13af8e77ea3e0dff80db9b2e0007535c21d49094 (diff) |
ALSA: hda - Name the primary out as Speaker when needed for VIA codecs
When the primary output is the speaker output, rather name it as
"Speaker". This will be more intuitive.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_via.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index bd6ffa602f22..6e621b7c984e 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c | |||
@@ -1770,7 +1770,11 @@ static int via_auto_create_multi_out_ctls(struct hda_codec *codec) | |||
1770 | if (err < 0) | 1770 | if (err < 0) |
1771 | return err; | 1771 | return err; |
1772 | } else { | 1772 | } else { |
1773 | err = create_ch_ctls(codec, chname[i], pin, dac, 3); | 1773 | const char *pfx = chname[i]; |
1774 | if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT && | ||
1775 | cfg->line_outs == 1) | ||
1776 | pfx = "Speaker"; | ||
1777 | err = create_ch_ctls(codec, pfx, pin, dac, 3); | ||
1774 | if (err < 0) | 1778 | if (err < 0) |
1775 | return err; | 1779 | return err; |
1776 | } | 1780 | } |