Commit aed859a2 authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown

ASoC: Intel: bytcr_rt5651: Only create jack if we have a jack-detect source

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: default avatarCarlo Caione <carlo@endlessm.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c2f26938
...@@ -404,17 +404,21 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) ...@@ -404,17 +404,21 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
dev_err(card->dev, "unable to set MCLK rate\n"); 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", ret = snd_soc_card_jack_new(runtime->card, "Headset",
SND_JACK_HEADSET, &priv->jack, SND_JACK_HEADSET, &priv->jack,
bytcr_jack_pins, ARRAY_SIZE(bytcr_jack_pins)); bytcr_jack_pins, ARRAY_SIZE(bytcr_jack_pins));
if (ret) { 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; 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 ret;
}
return 0;
} }
static const struct snd_soc_pcm_stream byt_rt5651_dai_params = { static const struct snd_soc_pcm_stream byt_rt5651_dai_params = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment