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 3/4] ASoC: es8389: report resume restore errors
Date: Sun, 6 Sep 2026 11:42:16 +0800 [thread overview]
Message-ID: <20260906034217.85696-4-hppiscas@163.com> (raw)
es8389_resume() ignores the reset-register read, bias restoration and
register-cache replay. A failed read can leave regv uninitialized before
it selects the initialization path.
Check those operations and always leave cache bypass before returning an
error. The ASoC component wrapper reports callback failures while retaining
its best-effort resume contract.
The issue was found by our static-analysis tool and manually reviewed.
Fixes: 0319c26889f7 ("ASoC: codecs: add support for ES8389")
Assisted-by: gpt 5
Signed-off-by: Pengpeng Hou <hppiscas@163.com>
---
sound/soc/codecs/es8389.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/es8389.c b/sound/soc/codecs/es8389.c
index 80efce3e0a22..204fe6731140 100644
--- a/sound/soc/codecs/es8389.c
+++ b/sound/soc/codecs/es8389.c
@@ -1026,20 +1026,28 @@ static int es8389_resume(struct snd_soc_component *component)
{
struct es8389_private *es8389 = snd_soc_component_get_drvdata(component);
unsigned int regv;
+ int ret;
regcache_cache_only(es8389->regmap, false);
regcache_cache_bypass(es8389->regmap, true);
- regmap_read(es8389->regmap, ES8389_RESET, ®v);
+ ret = regmap_read(es8389->regmap, ES8389_RESET, ®v);
+ if (ret)
+ goto disable_bypass;
- if (regv == 0xff)
+ if (regv == 0xff) {
es8389_init(component);
- else
- es8389_set_bias_level(component, SND_SOC_BIAS_ON);
+ } else {
+ ret = es8389_set_bias_level(component, SND_SOC_BIAS_ON);
+ if (ret)
+ goto disable_bypass;
+ }
+disable_bypass:
regcache_cache_bypass(es8389->regmap, false);
- regcache_sync(es8389->regmap);
+ if (ret)
+ return ret;
- return 0;
+ return regcache_sync(es8389->regmap);
}
static int es8389_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-4-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