Messages in this thread Patch in this message | | | Date | Tue, 22 Feb 2011 14:17:24 -0800 | From | Greg KH <> | Subject | [45/70] ALSA: HDA: Do not announce false surround in Conexant auto |
| |
2.6.37-stable review patch. If anyone has any objections, please let us know.
------------------
From: David Henningsson <david.henningsson@canonical.com>
commit 89724958e5d596bb91328644c97dd80399443e87 upstream.
Without this patch, one line-out and one speaker and Conexant's auto parser would announce (non-working) surround capabilities.
BugLink: http://bugs.launchpad.net/bugs/721126 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_conexant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3401,7 +3401,7 @@ static void cx_auto_parse_output(struct } } spec->multiout.dac_nids = spec->private_dac_nids; - spec->multiout.max_channels = nums * 2; + spec->multiout.max_channels = spec->multiout.num_dacs * 2; if (cfg->hp_outs > 0) spec->auto_mute = 1;
| |