Commit ebbeb3d6 authored Mar 04, 2011 by David Henningsson Committed by Takashi Iwai Mar 10, 2011

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>

parent 32eea388

sound/pci/hda/patch_realtek.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5080,7 +5080,9 @@ static const char alc_get_line_out_pfx(const struct auto_pin_cfg cfg,

	switch (cfg->line_out_type) {		switch (cfg->line_out_type) {
	case AUTO_PIN_SPEAKER_OUT:		case AUTO_PIN_SPEAKER_OUT:
			if (cfg->line_outs == 1)
	return "Speaker";		return "Speaker";
			break;
	case AUTO_PIN_HP_OUT:		case AUTO_PIN_HP_OUT:
	return "Headphone";		return "Headphone";
	default:		default: