diff options
| author |   Jie Yang <yang.jie@intel.com> | 2015-04-27 21:20:59 +0800 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2015-04-27 21:37:42 +0200 |
| commit | 2ba2dfa1fcc7ce5d2bf1716ec3d32b6fa0882e68 (patch) | |
| tree | f6cac8ccd939ac190628dc9210d41f0ddca8419c /include/sound/control.h | |
| parent | ALSA: jack: extend snd_jack_new to support phantom jack (diff) | |
| download | linux-dev-2ba2dfa1fcc7ce5d2bf1716ec3d32b6fa0882e68.tar.xz linux-dev-2ba2dfa1fcc7ce5d2bf1716ec3d32b6fa0882e68.zip | |
ALSA: hda - Update to use the new jack kctls method
Jack snd_kcontrols can now be created during snd_jack_new()
or by later calling snd_jack_add_new_kctls().
This patch creates the jacks during the initialisation stage
for both phantom and non phantom jacks.
Signed-off-by: Jie Yang <yang.jie@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/control.h')
| -rw-r--r-- | include/sound/control.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/control.h b/include/sound/control.h index f50e2e918ceb..21d047f229a1 100644 --- a/include/sound/control.h +++ b/include/sound/control.h @@ -252,7 +252,7 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only); * Helper functions for jack-detection controls */ struct snd_kcontrol * -snd_kctl_jack_new(const char *name, void *private_data, struct snd_card *card); +snd_kctl_jack_new(const char *name, struct snd_card *card); void snd_kctl_jack_report(struct snd_card *card, struct snd_kcontrol *kctl, bool status); |