diff options
| author | Mark Brown <broonie@kernel.org> | 2018-03-07 14:16:00 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-03-07 14:16:00 +0000 |
| commit | c9ae06deccac6097dd9260dce6762c748340d2a5 (patch) | |
| tree | 54564586d4b3d91a8aa1081085dbc828616d35b6 /sound/soc/intel/boards/bytcr_rt5651.c | |
| parent | e39cacc1b7de2a6d72ce49043c9cfd7dd129135a (diff) | |
| parent | ee68096826fa16bca2f7bb555b3e0cbbe798d330 (diff) | |
| download | linux-c9ae06deccac6097dd9260dce6762c748340d2a5.tar.bz2 | |
Merge branch 'topic/rt5651' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'sound/soc/intel/boards/bytcr_rt5651.c')
| -rw-r--r-- | sound/soc/intel/boards/bytcr_rt5651.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 105339c5b693..6288c27d87ce 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -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; } |