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

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

ASoC: mfld_machine: 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 avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fb1edb4b

sound/soc/intel/mfld_machine.c

+4 −9
Original line number Diff line number Diff line
@@ -255,20 +255,15 @@ static int mfld_init(struct snd_soc_pcm_runtime *runtime) 
	snd_soc_dapm_disable_pin(dapm, "LINEINR");



	/* Headset and button jack detection */

	ret_val = snd_soc_jack_new(runtime->codec, "Intel(R) MID Audio Jack",

			SND_JACK_HEADSET | SND_JACK_BTN_0 |

			SND_JACK_BTN_1, &mfld_jack);

	ret_val = snd_soc_card_jack_new(runtime->card,

			"Intel(R) MID Audio Jack", SND_JACK_HEADSET |

			SND_JACK_BTN_0 | SND_JACK_BTN_1, &mfld_jack,

			mfld_jack_pins, ARRAY_SIZE(mfld_jack_pins));

	if (ret_val) {

		pr_err("jack creation failed\n");

		return ret_val;

	}



	ret_val = snd_soc_jack_add_pins(&mfld_jack,

			ARRAY_SIZE(mfld_jack_pins), mfld_jack_pins);

	if (ret_val) {

		pr_err("adding jack pins failed\n");

		return ret_val;

	}

	ret_val = snd_soc_jack_add_zones(&mfld_jack,

			ARRAY_SIZE(mfld_zones), mfld_zones);

	if (ret_val) {