From: Pengpeng Hou <hppiscas@163.com>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: Pengpeng Hou <hppiscas@163.com>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Zhang Yi <zhangyi@everest-semi.com>,
linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] ASoC: es8375: report resume restore errors
Date: Sun, 6 Sep 2026 11:42:15 +0800 [thread overview]
Message-ID: <20260906034217.85696-3-hppiscas@163.com> (raw)
es8375_resume() ignores the clock-status read, bias restoration and
register-cache replay. A read failure can leave reg uninitialized before
it selects the initialization path, and later resume processing cannot
observe a failed restore.
Return the fallible operation results to the ASoC component wrapper, which
reports callback failures while retaining its best-effort resume contract.
The issue was found by our static-analysis tool and manually reviewed.
Fixes: de2b3119f9f7 ("ASoC: codecs: add support for ES8375")
Assisted-by: gpt 5
Signed-off-by: Pengpeng Hou <hppiscas@163.com>
---
sound/soc/codecs/es8375.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/sound/soc/codecs/es8375.c b/sound/soc/codecs/es8375.c
index e8747bc24433..2c58225feddd 100644
--- a/sound/soc/codecs/es8375.c
+++ b/sound/soc/codecs/es8375.c
@@ -577,20 +577,24 @@ static int es8375_resume(struct snd_soc_component *component)
{
struct es8375_priv *es8375 = snd_soc_component_get_drvdata(component);
unsigned int reg;
+ int ret;
regcache_cache_only(es8375->regmap, false);
regcache_cache_bypass(es8375->regmap, true);
- regmap_read(es8375->regmap, ES8375_CLK_MGR2, ®);
+ ret = regmap_read(es8375->regmap, ES8375_CLK_MGR2, ®);
regcache_cache_bypass(es8375->regmap, false);
+ if (ret)
+ return ret;
- if (reg == 0x00)
+ if (reg == 0x00) {
es8375_init(component);
- else
- es8375_set_bias_level(component, SND_SOC_BIAS_ON);
-
- regcache_sync(es8375->regmap);
+ } else {
+ ret = es8375_set_bias_level(component, SND_SOC_BIAS_ON);
+ if (ret)
+ return ret;
+ }
- return 0;
+ return regcache_sync(es8375->regmap);
}
static int es8375_codec_probe(struct snd_soc_component *component)
--
2.50.1 (Apple Git-155)
reply other threads:[~2026-09-06 3:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260906034217.85696-3-hppiscas@163.com \
--to=hppiscas@163.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
--cc=zhangyi@everest-semi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox