diff options
| author | Mark Brown <broonie@kernel.org> | 2018-03-28 10:26:09 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-03-28 10:26:09 +0800 |
| commit | 5b6d7104f65c6a9271da71db5be01d08c04584ea (patch) | |
| tree | ccf7e0c258eaf70a1aab7f07fe49ba57ec08421b /sound/soc/rockchip | |
| parent | 342fd472e8486fa77aa54028861e2eba86e90bd4 (diff) | |
| parent | 2759ba9bf811f81c31d14e32f8cff022d54dce1f (diff) | |
| download | linux-5b6d7104f65c6a9271da71db5be01d08c04584ea.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/rockchip')
| -rw-r--r-- | sound/soc/rockchip/rk3399_gru_sound.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 214bfc78cf5c..9a10181a0811 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -176,7 +176,7 @@ static int rockchip_sound_da7219_hw_params(struct snd_pcm_substream *substream, static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_codec *codec = rtd->codec_dais[0]->codec; + struct snd_soc_component *component = rtd->codec_dais[0]->component; struct snd_soc_dai *codec_dai = rtd->codec_dai; int ret; @@ -215,7 +215,7 @@ static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd) snd_jack_set_key( rockchip_sound_jack.jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); - da7219_aad_jack_det(codec, &rockchip_sound_jack); + da7219_aad_jack_det(component, &rockchip_sound_jack); return 0; } |