From 8a805f1e7f3aea14039f7d57836e5f6ea993f37e Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Fri, 4 Mar 2011 14:08:30 +0100 Subject: [PATCH] ALSA: HDA: Fix volume control naming for surround speakers on Realtek auto-parser MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/patch_realtek.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8caf593fcf20..8c61566bdc58 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: -- 2.39.5