diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2012-09-06 11:17:58 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-06 12:01:55 +0200 |
| commit | 298efee7f5a20a32c9ebfa0f7469d87d84998ba1 (patch) | |
| tree | 99ed9d761f13362848f06f1e17815eda9d60e856 /sound/pci/hda/patch_sigmatel.c | |
| parent | ALSA: HDMI - Setup channel mapping for non_pcm audio (diff) | |
| download | linux-298efee7f5a20a32c9ebfa0f7469d87d84998ba1.tar.xz linux-298efee7f5a20a32c9ebfa0f7469d87d84998ba1.zip | |
ALSA: hda - fix control names for multiple speaker out on IDT/STAC
For multiple speaker outs, the names were previously
"Speaker,0", "Speaker,1", "Center"/"LFE", "Speaker,3". This is
inconsistent, confusing, and is not picked up correctly by PulseAudio.
Instead use "Front", "Surround", "Center"/"LFE", "Side" which
is more standard.
BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1046734
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 9db305633efe..c16d0f822b5b 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -3226,9 +3226,12 @@ static int create_multi_out_ctls(struct hda_codec *codec, int num_outs, idx = i; break; case AUTO_PIN_SPEAKER_OUT: - name = "Speaker"; - idx = i; - break; + if (num_outs <= 1) { + name = "Speaker"; + idx = i; + break; + } + /* Fall through in case of multi speaker outs */ default: name = chname[i]; idx = 0; |