xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'topic/rt5651' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel

Browse Source
This commit is contained in:
Mark Brown
2018-03-07 14:16:00 +00:00
parent e39cacc1b7 ee68096826
commit c9ae06decc
5 changed files with 447 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/intel/boards/bytcr_rt5651.c
View File

@@ -296,7 +296,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
{
struct snd_soc_card *card = runtime->card;
struct snd_soc_codec *codec = runtime->codec;
struct snd_soc_component *codec = runtime->codec_dai->component;
struct byt_rt5651_private *priv = snd_soc_card_get_drvdata(card);
const struct snd_soc_dapm_route *custom_map;
int num_routes;
@@ -370,7 +370,7 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
return ret;
}
rt5651_set_jack_detect(codec, &priv->jack);
snd_soc_component_set_jack(codec, &priv->jack, NULL);
return ret;
}