[PATCH] ASoC: cs35l56: Fix hibernate write in runtime resume error path

[PATCH] ASoC: cs35l56: Fix hibernate write in runtime resume error path

[Richard Fitzgerald]

The error path of cs35l56_runtime_resume_common() should only write
the hibernation sequence if can_hibernate is true.

Something has already gone badly wrong if we ever reach the error
path. But triggering hibernate on hardware that does not support it
is likely to make the situation unrecoverable without a full reboot
necause there might not be any hardware signal to exit hibernate.

Fixes: a47cf4dac7dc ("ASoC: cs35l56: Change hibernate sequence to use allow auto hibernate")
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
---
 sound/soc/codecs/cs35l56-shared.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c
index 033e56d5e9db..ea724101cdd1 100644
--- a/sound/soc/codecs/cs35l56-shared.c
+++ b/sound/soc/codecs/cs35l56-shared.c
@@ -851,9 +851,11 @@ int cs35l56_runtime_resume_common(struct cs35l56_base *cs35l56_base, bool is_sou
 err:
 	regcache_cache_only(cs35l56_base->regmap, true);
 
-	regmap_multi_reg_write_bypassed(cs35l56_base->regmap,
-					cs35l56_hibernate_seq,
-					ARRAY_SIZE(cs35l56_hibernate_seq));
+	if (cs35l56_base->can_hibernate) {
+		regmap_multi_reg_write_bypassed(cs35l56_base->regmap,
+						cs35l56_hibernate_seq,
+						ARRAY_SIZE(cs35l56_hibernate_seq));
+	}
 
 	return ret;
 }
-- 
2.47.3

Re: [PATCH] ASoC: cs35l56: Fix hibernate write in runtime resume error path

[Richard Fitzgerald]

On 29/04/2026 11:41 am, Richard Fitzgerald wrote:
> The error path of cs35l56_runtime_resume_common() should only write
> the hibernation sequence if can_hibernate is true.
> 
> Something has already gone badly wrong if we ever reach the error
> path. But triggering hibernate on hardware that does not support it
> is likely to make the situation unrecoverable without a full reboot
> necause there might not be any hardware signal to exit hibernate.
> 

Aargh. The typo that I didn't notice until I'd sent the email.
Will fix this in a V2.