]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ALSA: HDA: Do not announce false surround in Conexant auto
authorDavid Henningsson <david.henningsson@canonical.com>
Wed, 16 Feb 2011 20:34:04 +0000 (21:34 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 19 Feb 2011 15:14:37 +0000 (16:14 +0100)
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
Cc: stable@kernel.org
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_conexant.c

index cd29eafdc0edf561138ff4efbd9e894b37d35323..dd7c5c12225d29123d4bf13cb5247e962a864c66 100644 (file)
@@ -3410,7 +3410,7 @@ static void cx_auto_parse_output(struct hda_codec *codec)
                }
        }
        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;