[PATCH] ALSA: HDA: Do not announce false surround in Conexant auto

[PATCH] ALSA: HDA: Do not announce false surround in Conexant auto

[David Henningsson]

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

Without this patch, one line-out and one speaker and
Conexant's auto parser would announce (non-working) surround
capabilities.

-- 
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic

[-- Attachment #2: 0001-ALSA-HDA-Do-not-announce-false-surround-in-Conexant-.patch --]
[-- Type: text/x-patch, Size: 1093 bytes --]

>From d7acab6cd1aa8be6a04d1c9a47d1802a39597a3e Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Wed, 16 Feb 2011 21:34:04 +0100
Subject: [PATCH] ALSA: HDA: Do not announce false surround in Conexant auto

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>
---
 sound/pci/hda/patch_conexant.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index fbe97d3..029741f 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -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;
-- 
1.7.1


[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] ALSA: HDA: Do not announce false surround in Conexant auto

[Takashi Iwai]

At Fri, 18 Feb 2011 09:33:55 +0100,
David Henningsson wrote:
> 
> Without this patch, one line-out and one speaker and
> Conexant's auto parser would announce (non-working) surround
> capabilities.

Thanks, applied now.


Takashi

> 
> -- 
> David Henningsson, Canonical Ltd.
> http://launchpad.net/~diwic
> [2 0001-ALSA-HDA-Do-not-announce-false-surround-in-Conexant-.patch <text/x-patch (7bit)>]
> >From d7acab6cd1aa8be6a04d1c9a47d1802a39597a3e Mon Sep 17 00:00:00 2001
> From: David Henningsson <david.henningsson@canonical.com>
> Date: Wed, 16 Feb 2011 21:34:04 +0100
> Subject: [PATCH] ALSA: HDA: Do not announce false surround in Conexant auto
> 
> 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>
> ---
>  sound/pci/hda/patch_conexant.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
> index fbe97d3..029741f 100644
> --- a/sound/pci/hda/patch_conexant.c
> +++ b/sound/pci/hda/patch_conexant.c
> @@ -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;
> -- 
> 1.7.1
>