diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2011-03-04 14:08:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-23 13:03:54 -0700 |
| commit | 8a805f1e7f3aea14039f7d57836e5f6ea993f37e (patch) | |
| tree | d630d524e6ab2db7e41e20fc454537ab4e39e460 /sound | |
| parent | 3e3aecb4096a92f2dd8ac1abdabf4dd68218d67e (diff) | |
ALSA: HDA: Fix volume control naming for surround speakers on Realtek auto-parser
commit ebbeb3d6aa22433c218da6f29fd7b3ebc89b87ea upstream.
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>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8caf593fcf2..8c61566bdc5 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5151,7 +5151,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: |