Signed-off-by: David Henningsson david.henningsson@canonical.com ---
Hi Takashi,
A patch for your jack branch - it seems you forgot to add kctls for conexant? Also it would be nice to see this merged, soon it might be too late for 3.3?
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); }