Messages in this thread Patch in this message | | | Date | Mon, 21 Mar 2011 16:01:55 -0700 | From | Greg KH <> | Subject | [39/78] ALSA: HDA: Fix volume control naming for surround speakers on Realtek auto-parser |
| |
2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: David Henningsson <david.henningsson@canonical.com>
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>
--- sound/pci/hda/patch_realtek.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
--- 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( 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:
-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |