aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_via.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-11-08 09:59:23 -0500
committerTakashi Iwai <tiwai@suse.de>2012-11-08 11:00:37 -0500
commitf37bc7a88d374448a1f4bba9267d308606d78bf2 (patch)
tree00d1142a082adce61d52a15ad543852af391c1a1 /sound/pci/hda/patch_via.c
parent17a4adbe68c8e6c1fde8decb2345dc4acea87934 (diff)
ALSA: hda - Give standard "Bass Speaker" mixer for 2.1 speakers
When two built-in speakers are found on the machine, we can suppose it's rather a 2.1 speaker system with a bass output instead of front/surround channels. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_via.c')
-rw-r--r--sound/pci/hda/patch_via.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 019e1a00414a..0e9b0747adc6 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -1454,7 +1454,7 @@ static const struct hda_pcm_stream via_pcm_digital_capture = {
1454 */ 1454 */
1455static const char * const via_slave_pfxs[] = { 1455static const char * const via_slave_pfxs[] = {
1456 "Front", "Surround", "Center", "LFE", "Side", 1456 "Front", "Surround", "Center", "LFE", "Side",
1457 "Headphone", "Speaker", 1457 "Headphone", "Speaker", "Bass Speaker",
1458 NULL, 1458 NULL,
1459}; 1459};
1460 1460
@@ -1969,8 +1969,8 @@ static int via_auto_create_multi_out_ctls(struct hda_codec *codec)
1969 } else { 1969 } else {
1970 const char *pfx = chname[i]; 1970 const char *pfx = chname[i];
1971 if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT && 1971 if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT &&
1972 cfg->line_outs == 1) 1972 cfg->line_outs <= 2)
1973 pfx = "Speaker"; 1973 pfx = i ? "Bass Speaker" : "Speaker";
1974 err = create_ch_ctls(codec, pfx, 3, true, path); 1974 err = create_ch_ctls(codec, pfx, 3, true, path);
1975 if (err < 0) 1975 if (err < 0)
1976 return err; 1976 return err;