diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-08 18:59:23 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-08 20:00:37 +0400 |
| commit | f37bc7a88d374448a1f4bba9267d308606d78bf2 (patch) | |
| tree | 00d1142a082adce61d52a15ad543852af391c1a1 /sound/pci/hda/patch_via.c | |
| parent | 17a4adbe68c8e6c1fde8decb2345dc4acea87934 (diff) | |
| download | linux-f37bc7a88d374448a1f4bba9267d308606d78bf2.tar.xz | |
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.c | 6 |
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 = { */ static const char * const via_slave_pfxs[] = { "Front", "Surround", "Center", "LFE", "Side", - "Headphone", "Speaker", + "Headphone", "Speaker", "Bass Speaker", NULL, }; @@ -1969,8 +1969,8 @@ static int via_auto_create_multi_out_ctls(struct hda_codec *codec) } else { const char *pfx = chname[i]; if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT && - cfg->line_outs == 1) - pfx = "Speaker"; + cfg->line_outs <= 2) + pfx = i ? "Bass Speaker" : "Speaker"; err = create_ch_ctls(codec, pfx, 3, true, path); if (err < 0) return err; |