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

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

ASoC: omap-twl4030: 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 25649592

sound/soc/omap/omap-twl4030.c

+4 −8
Original line number Diff line number Diff line
@@ -170,14 +170,10 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd) 
	if (priv->jack_detect > 0) {

		hs_jack_gpios[0].gpio = priv->jack_detect;



		ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,

				       &priv->hs_jack);

		if (ret)

			return ret;



		ret = snd_soc_jack_add_pins(&priv->hs_jack,

					    ARRAY_SIZE(hs_jack_pins),

					    hs_jack_pins);

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

					    SND_JACK_HEADSET, &priv->hs_jack,

					    hs_jack_pins,

					    ARRAY_SIZE(hs_jack_pins));

		if (ret)

			return ret;