On 2023/10/30 下午 06:36, shumingf@realtek.com wrote:
From: Shuming Fan shumingf@realtek.com
Sometimes the codec probe would be called earlier than the hardware initialization. Therefore, the speaker route should be added before the the first_hw_init check.
Signed-off-by: Shuming Fan shumingf@realtek.com
Do we need
Fixes: f3da2ed110e2 ("ASoC: rt1712-sdca: enable pm_runtime in probe, keep status as 'suspended'")?
sound/soc/codecs/rt712-sdca.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/soc/codecs/rt712-sdca.c b/sound/soc/codecs/rt712-sdca.c index 7077ff6ba1f4..6954fbe7ec5f 100644 --- a/sound/soc/codecs/rt712-sdca.c +++ b/sound/soc/codecs/rt712-sdca.c @@ -963,13 +963,6 @@ static int rt712_sdca_probe(struct snd_soc_component *component) rt712_sdca_parse_dt(rt712, &rt712->slave->dev); rt712->component = component;
- if (!rt712->first_hw_init)
return 0;- ret = pm_runtime_resume(component->dev);
- if (ret < 0 && ret != -EACCES)
return ret;- /* add SPK route */ if (rt712->hw_id != RT712_DEV_ID_713) { snd_soc_add_component_controls(component,
@@ -980,6 +973,13 @@ static int rt712_sdca_probe(struct snd_soc_component *component) rt712_sdca_spk_dapm_routes, ARRAY_SIZE(rt712_sdca_spk_dapm_routes)); }
- if (!rt712->first_hw_init)
return 0;- ret = pm_runtime_resume(component->dev);
- if (ret < 0 && ret != -EACCES)
return ret;- return 0; }