[alsa-devel] [PATCH] ALSA: hda/jack - Also add jack kctls for Conexant codecs

[Takashi Iwai]

At Tue, 20 Dec 2011 15:23:05 +0100,
David Henningsson wrote:
> 
> Signed-off-by: David Henningsson <david.henningsson at canonical.com>
> ---
> 
> Hi Takashi,
> 
> A patch for your jack branch - it seems you forgot to add kctls for conexant?

Obviously yes.  Applied now.

> Also it would be nice to see this merged, soon it might be too late for 3.3?

OK, let's merge it.  The things are still local to hda-intel, so we
can fix pending issues and rewrite with a more generic framework later
for unified jack-handling stuff.


thanks,

Takashi

>  sound/pci/hda/patch_conexant.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
> index ae9c028..99942e6 100644
> --- a/sound/pci/hda/patch_conexant.c
> +++ b/sound/pci/hda/patch_conexant.c
> @@ -4325,6 +4325,7 @@ static int cx_auto_build_input_controls(struct hda_codec *codec)
>  
>  static int cx_auto_build_controls(struct hda_codec *codec)
>  {
> +	struct conexant_spec *spec = codec->spec;
>  	int err;
>  
>  	err = cx_auto_build_output_controls(codec);
> @@ -4333,6 +4334,9 @@ static int cx_auto_build_controls(struct hda_codec *codec)
>  	err = cx_auto_build_input_controls(codec);
>  	if (err < 0)
>  		return err;
> +	err = snd_hda_jack_add_kctls(codec, &spec->autocfg);
> +	if (err < 0)
> +		return err;
>  	return conexant_build_controls(codec);
>  }
>  
> -- 
> 1.7.5.4
>