summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/imx-es8328.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-03-04 10:33:19 +0100
committerMark Brown <broonie@kernel.org>2015-03-04 17:09:52 +0000
commit27cb64b474516421001932d966ca3184795d4e29 (patch)
tree715e7f0a2adb1aa2624fe867034dd3f56e51796b /sound/soc/fsl/imx-es8328.c
parent386669fcec85a16cb81cd19236abe76abe0f1fc1 (diff)
ASoC: imx-es8328: Register jacks at the card level
The jacks are card level elements so use snd_soc_card_jack_new() instead of snd_soc_jack_new() to register them. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/fsl/imx-es8328.c')
-rw-r--r--sound/soc/fsl/imx-es8328.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/imx-es8328.c b/sound/soc/fsl/imx-es8328.c
index f8cf10e16ce9..20e7400e2611 100644
--- a/sound/soc/fsl/imx-es8328.c
+++ b/sound/soc/fsl/imx-es8328.c
@@ -53,9 +53,9 @@ static int imx_es8328_dai_init(struct snd_soc_pcm_runtime *rtd)
/* Headphone jack detection */
if (gpio_is_valid(data->jack_gpio)) {
- ret = snd_soc_jack_new(rtd->codec, "Headphone",
- SND_JACK_HEADPHONE | SND_JACK_BTN_0,
- &headset_jack);
+ ret = snd_soc_card_jack_new(rtd->card, "Headphone",
+ SND_JACK_HEADPHONE | SND_JACK_BTN_0,
+ &headset_jack, NULL, 0);
if (ret)
return ret;