summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorJie Yang <yang.jie@intel.com>2015-04-27 16:20:57 +0300
committerTakashi Iwai <tiwai@suse.de>2015-04-27 22:37:41 +0300
commitb8dd086674cfbfc246a5b9d7d7ff37f62350a878 (patch)
tree035c115047a4c0fbbf99a352f7f66331e6a53815 /sound/pci
parent9058cbe1eed29381f84dec9f96980f5a4ea1025f (diff)
downloadlinux-b8dd086674cfbfc246a5b9d7d7ff37f62350a878.tar.xz
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/pci')
-rw-r--r--sound/pci/hda/hda_jack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index d7cfe7b8c32b..05b49aa8af6c 100644
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
@@ -402,7 +402,7 @@ static int __snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
return 0;
if (jack->kctl)
return 0; /* already created */
- kctl = snd_kctl_jack_new(name, idx, codec);
+ kctl = snd_kctl_jack_new(name, codec, codec->card);
if (!kctl)
return -ENOMEM;
err = snd_hda_ctl_add(codec, nid, kctl);