ASoC: broadwell: Register jacks at the card level (85c85e5d) · Commits · 戴 / test

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:

sound/soc/intel/broadwell.c

+3 −9

Original line number	Diff line number	Diff line
		@@ -80,15 +80,9 @@ static int broadwell_rt286_codec_init(struct snd_soc_pcm_runtime *rtd)
		{
		struct snd_soc_codec *codec = rtd->codec;
		int ret = 0;
		ret = snd_soc_jack_new(codec, "Headset",
		SND_JACK_HEADSET \| SND_JACK_BTN_0, &broadwell_headset);

		if (ret)
		return ret;

		ret = snd_soc_jack_add_pins(&broadwell_headset,
		ARRAY_SIZE(broadwell_headset_pins),
		broadwell_headset_pins);
		ret = snd_soc_card_jack_new(rtd->card, "Headset",
		SND_JACK_HEADSET \| SND_JACK_BTN_0, &broadwell_headset,
		broadwell_headset_pins, ARRAY_SIZE(broadwell_headset_pins));
		if (ret)
		return ret;