summaryrefslogtreecommitdiff
path: root/sound/core/jack.c
diff options
context:
space:
mode:
authorJie Yang <yang.jie@intel.com>2015-04-27 21:20:57 +0800
committerTakashi Iwai <tiwai@suse.de>2015-04-27 21:37:41 +0200
commitb8dd086674cfbfc246a5b9d7d7ff37f62350a878 (patch)
tree035c115047a4c0fbbf99a352f7f66331e6a53815 /sound/core/jack.c
parent9058cbe1eed29381f84dec9f96980f5a4ea1025f (diff)
ALSA: Jack: handle jack embedded kcontrol creating within ctljack
This patch adds a static method get_available_index() to allocate the index of new jack kcontrols and also adds jack_kctl_name_gen() which is used to ensure compatibility with jack naming by removing " Jack" from some incorrectly passed names. Signed-off-by: Jie Yang <yang.jie@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/jack.c')
-rw-r--r--sound/core/jack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/jack.c b/sound/core/jack.c
index db69ecc23651..067d37d14e64 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -135,7 +135,7 @@ static struct snd_jack_kctl * snd_jack_kctl_new(struct snd_card *card, const cha
struct snd_jack_kctl *jack_kctl;
int err;
- kctl = snd_kctl_jack_new(name, 0, card);
+ kctl = snd_kctl_jack_new(name, card, card);
if (!kctl)
return NULL;