alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: David Henningsson <david.henningsson@canonical.com>
To: alsa-devel@alsa-project.org, tiwai@suse.de
Cc: David Henningsson <david.henningsson@canonical.com>
Subject: [PATCH] ALSA: hda/jack - Also add jack kctls for Conexant codecs
Date: Tue, 20 Dec 2011 15:23:05 +0100	[thread overview]
Message-ID: <1324390985-3496-1-git-send-email-david.henningsson@canonical.com> (raw)

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);
 }
 
-- 
1.7.5.4

             reply	other threads:[~2011-12-20 14:23 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-20 14:23 David Henningsson [this message]
2011-12-20 14:32 ` [PATCH] ALSA: hda/jack - Also add jack kctls for Conexant codecs Takashi Iwai
2011-12-20 14:44   ` Takashi Iwai
2011-12-20 23:58   ` Mark Brown
2011-12-21 14:42     ` Takashi Iwai
2011-12-22  1:08       ` Mark Brown
2011-12-22 12:21       ` Mark Brown
2011-12-22 13:55         ` Takashi Iwai
2011-12-22 14:12           ` Mark Brown
2011-12-22 14:19             ` Takashi Iwai
2011-12-22 14:29               ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1324390985-3496-1-git-send-email-david.henningsson@canonical.com \
    --to=david.henningsson@canonical.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).