summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-jack.c
diff options
context:
space:
mode:
authorJie Yang <yang.jie@intel.com>2015-04-27 21:20:58 +0800
committerTakashi Iwai <tiwai@suse.de>2015-04-27 21:37:41 +0200
commit4e3f0dc65883cac95807549b2f7a3ac183686bcb (patch)
tree68b4c872e0a9167909730354af05cf54b061c02c /sound/soc/soc-jack.c
parentb8dd086674cfbfc246a5b9d7d7ff37f62350a878 (diff)
downloadlinux-4e3f0dc65883cac95807549b2f7a3ac183686bcb.tar.bz2
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/soc/soc-jack.c')
-rw-r--r--sound/soc/soc-jack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 9f60c25c4568..70a9bdd5f3e3 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -48,7 +48,7 @@ int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,
INIT_LIST_HEAD(&jack->jack_zones);
BLOCKING_INIT_NOTIFIER_HEAD(&jack->notifier);
- ret = snd_jack_new(card->snd_card, id, type, &jack->jack);
+ ret = snd_jack_new(card->snd_card, id, type, &jack->jack, false, false);
if (ret)
return ret;