ASoC: Intel: bytcr_rt5651: Only create jack if we have a jack-detect source (aed859a2) · Commits · 戴 / test

Only create the jack if we have a valid jack-detect source and properly check the snd_soc_component_set_jack() return value. Tested-by:

sound/soc/intel/boards/bytcr_rt5651.c

+11 −7

Original line number	Diff line number	Diff line
		@@ -404,19 +404,23 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
		dev_err(card->dev, "unable to set MCLK rate\n");
		}

		if (BYT_RT5651_JDSRC(byt_rt5651_quirk)) {
		ret = snd_soc_card_jack_new(runtime->card, "Headset",
		SND_JACK_HEADSET, &priv->jack,
		bytcr_jack_pins, ARRAY_SIZE(bytcr_jack_pins));
		if (ret) {
		dev_err(runtime->dev, "Headset jack creation failed %d\n", ret);
		dev_err(runtime->dev, "jack creation failed %d\n", ret);
		return ret;
		}

		snd_soc_component_set_jack(codec, &priv->jack, NULL);

		ret = snd_soc_component_set_jack(codec, &priv->jack, NULL);
		if (ret)
		return ret;
		}

		return 0;
		}

		static const struct snd_soc_pcm_stream byt_rt5651_dai_params = {
		.formats = SNDRV_PCM_FMTBIT_S24_LE,
		.rate_min = 48000,