Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25649592 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: omap-abe-twl6040: 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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent df8c6618

sound/soc/omap/omap-abe-twl6040.c

+5 −5
Original line number Diff line number Diff line
@@ -182,17 +182,17 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) 


	/* Headset jack detection only if it is supported */

	if (priv->jack_detection) {

		ret = snd_soc_jack_new(codec, "Headset Jack",

					SND_JACK_HEADSET, &hs_jack);

		ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",

					    SND_JACK_HEADSET, &hs_jack,

					    hs_jack_pins,

					    ARRAY_SIZE(hs_jack_pins));

		if (ret)

			return ret;



		ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins),

					hs_jack_pins);

		twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET);

	}



	return ret;

	return 0;

}



static const struct snd_soc_dapm_route dmic_audio_map[] = {