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

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

ASoC: tegra_alc5632: 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>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3fd94f37

sound/soc/tegra/tegra_alc5632.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -106,11 +106,10 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) 
	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card);

	struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card);





	snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,

	snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET,

			 &tegra_alc5632_hs_jack);

			      &tegra_alc5632_hs_jack,

	snd_soc_jack_add_pins(&tegra_alc5632_hs_jack,

			      tegra_alc5632_hs_jack_pins,

			ARRAY_SIZE(tegra_alc5632_hs_jack_pins),

			      ARRAY_SIZE(tegra_alc5632_hs_jack_pins));

			tegra_alc5632_hs_jack_pins);





	if (gpio_is_valid(machine->gpio_hp_det)) {

	if (gpio_is_valid(machine->gpio_hp_det)) {

		tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det;

		tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det;