Merge tag 'dm-4.1-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[firefly-linux-kernel-4.4.55.git] / sound / soc / fsl / imx-es8328.c

diff --git a/sound/soc/fsl/imx-es8328.c b/sound/soc/fsl/imx-es8328.c
index f8cf10e16ce9c7ef0d192668894354dae320b840..20e7400e2611e41ef057d9b2e22413a7c6a73c98 100644 (file)
--- 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;