diff options
| author | Mark Brown <broonie@kernel.org> | 2016-12-02 00:47:57 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-12-02 00:47:57 +0300 |
| commit | 5203a3ca09d51b3f475fd12cf974f886147d371d (patch) | |
| tree | b927e41edc5b3656e4c52ac73a0148c6fa95a4d1 /sound/soc/intel/boards/cht_bsw_rt5672.c | |
| parent | fee3244cd1f5af813a24537950e211eee4f33297 (diff) | |
| parent | 9178feb4538e055bf22be44c38b90cc31d2baf99 (diff) | |
| download | linux-5203a3ca09d51b3f475fd12cf974f886147d371d.tar.xz | |
Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'sound/soc/intel/boards/cht_bsw_rt5672.c')
| -rw-r--r-- | sound/soc/intel/boards/cht_bsw_rt5672.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index fe607d8701a0..43603f1b4baa 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -294,10 +294,12 @@ static struct snd_soc_dai_link cht_dailink[] = { static int cht_suspend_pre(struct snd_soc_card *card) { - struct snd_soc_codec *codec; + struct snd_soc_component *component; + + list_for_each_entry(component, &card->component_dev_list, card_list) { + if (!strcmp(component->name, "i2c-10EC5670:00")) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); - list_for_each_entry(codec, &card->codec_dev_list, card_list) { - if (!strcmp(codec->component.name, cht_bsw_codec_name)) { dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n"); rt5670_jack_suspend(codec); break; @@ -308,10 +310,12 @@ static int cht_suspend_pre(struct snd_soc_card *card) static int cht_resume_post(struct snd_soc_card *card) { - struct snd_soc_codec *codec; + struct snd_soc_component *component; + + list_for_each_entry(component, &card->component_dev_list, card_list) { + if (!strcmp(component->name, "i2c-10EC5670:00")) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); - list_for_each_entry(codec, &card->codec_dev_list, card_list) { - if (!strcmp(codec->component.name, cht_bsw_codec_name)) { dev_dbg(codec->dev, "enabling jack detect for resume.\n"); rt5670_jack_resume(codec); break; |