diff options
-rw-r--r-- | sound/soc/omap/omap-abe-twl6040.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index b9c65f1ad5a8..0843a68f277c 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c | |||
@@ -182,17 +182,17 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) | |||
182 | 182 | ||
183 | /* Headset jack detection only if it is supported */ | 183 | /* Headset jack detection only if it is supported */ |
184 | if (priv->jack_detection) { | 184 | if (priv->jack_detection) { |
185 | ret = snd_soc_jack_new(codec, "Headset Jack", | 185 | ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", |
186 | SND_JACK_HEADSET, &hs_jack); | 186 | SND_JACK_HEADSET, &hs_jack, |
187 | hs_jack_pins, | ||
188 | ARRAY_SIZE(hs_jack_pins)); | ||
187 | if (ret) | 189 | if (ret) |
188 | return ret; | 190 | return ret; |
189 | 191 | ||
190 | ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins), | ||
191 | hs_jack_pins); | ||
192 | twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET); | 192 | twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET); |
193 | } | 193 | } |
194 | 194 | ||
195 | return ret; | 195 | return 0; |
196 | } | 196 | } |
197 | 197 | ||
198 | static const struct snd_soc_dapm_route dmic_audio_map[] = { | 198 | static const struct snd_soc_dapm_route dmic_audio_map[] = { |