Skip to contentSkip to conversation

ASoC: cs35l56: Fix hibernate write in runtime resume error path

PATCH Superseded Richard Fitzgerald 1 participant 2 messages Apr 29

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Richard Fitzgerald

author maintainer
#0 lore raw

PATCH 1/1 ASoC: cs35l56: Fix hibernate write in runtime resume error path

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")
---
 sound/soc/codecs/cs35l56-shared.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
sound/soc/codecs/cs35l56-shared.c +5 -3
index 033e56d5e9db..ea724101cdd1 100644
@@ -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;
 }
Signature · 1 line
2.47.3
author maintainer
#1 lore raw
Quoted 8 lines · 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.

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