summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2011-03-04 14:08:30 +0100
committerTakashi Iwai <tiwai@suse.de>2011-03-10 17:35:01 +0100
commitebbeb3d6aa22433c218da6f29fd7b3ebc89b87ea (patch)
tree8ebfb668e2ddc270dcf867bd268b3a904f2ca3d2 /sound
parent32eea3884debb65ec1da633bc5df5aee23879865 (diff)
downloadlinux-3.10-ebbeb3d6aa22433c218da6f29fd7b3ebc89b87ea.tar.gz
linux-3.10-ebbeb3d6aa22433c218da6f29fd7b3ebc89b87ea.tar.bz2
linux-3.10-ebbeb3d6aa22433c218da6f29fd7b3ebc89b87ea.zip
ALSA: HDA: Fix volume control naming for surround speakers on Realtek auto-parser
When more than one pair of internal speakers is present, allow names according to their channels. Tested-by: Bartłomiej Żogała <nusch88@gmail.com> Cc: <stable@kernel.org> Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index b4a22dd775a..6f59bccb104 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5080,7 +5080,9 @@ static const char *alc_get_line_out_pfx(const struct auto_pin_cfg *cfg,
switch (cfg->line_out_type) {
case AUTO_PIN_SPEAKER_OUT:
- return "Speaker";
+ if (cfg->line_outs == 1)
+ return "Speaker";
+ break;
case AUTO_PIN_HP_OUT:
return "Headphone";
default: