summaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_jack.c
diff options
context:
space:
mode:
authorJie Yang <yang.jie@intel.com>2015-04-27 16:20:58 +0300
committerTakashi Iwai <tiwai@suse.de>2015-04-27 22:37:41 +0300
commit4e3f0dc65883cac95807549b2f7a3ac183686bcb (patch)
tree68b4c872e0a9167909730354af05cf54b061c02c /sound/pci/hda/hda_jack.c
parentb8dd086674cfbfc246a5b9d7d7ff37f62350a878 (diff)
downloadlinux-4e3f0dc65883cac95807549b2f7a3ac183686bcb.tar.xz
ALSA: jack: extend snd_jack_new to support phantom jack
Dont create input devices for phantom jacks. Here, we extend snd_jack_new() to support phantom jack creating: pass in a bool param for [non-]phantom flag, and a bool param initial_jack to indicate whether we need to create a kctl at this stage. We can also add a kctl to the jack after its created meaning we can now integrate the HDA and ASoC jacks. Signed-off-by: Jie Yang <yang.jie@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_jack.c')
-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 05b49aa8af6c..16281c69bcd6 100644
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
@@ -417,7 +417,7 @@ static int __snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
if (!phantom_jack) {
jack->type = get_input_jack_type(codec, nid);
err = snd_jack_new(codec->card, name, jack->type,
- &jack->jack);
+ &jack->jack, false, false);
if (err < 0)
return err;
jack->jack->private_data = jack;