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

ASoC: z2: 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 3b14125b

sound/soc/pxa/z2.c

+3 −7
Original line number Diff line number Diff line
@@ -143,13 +143,9 @@ static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd) 
	snd_soc_dapm_disable_pin(dapm, "MONO1");



	/* Jack detection API stuff */

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

				&hs_jack);

	if (ret)

		goto err;



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

				hs_jack_pins);

	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)

		goto err;