commit: ebbeb3d6aa22433c218da6f29fd7b3ebc89b87ea From: David Henningsson <[email protected]> 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=UTF-8 Content-Transfer-Encoding: 8bit
When more than one pair of internal speakers is present, allow names according to their channels. Tested-by: BartÅomiej Å»ogaÅa <[email protected]> Cc: <[email protected]> Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- 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 b4a22dd..6f59bcc 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:
_______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
