]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: cs35l56: Fix hibernate write in runtime resume error path
authorRichard Fitzgerald <rf@opensource.cirrus.com>
Wed, 29 Apr 2026 10:53:15 +0000 (11:53 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 4 May 2026 13:03:15 +0000 (22:03 +0900)
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
because 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>
Link: https://patch.msgid.link/20260429105315.2438298-1-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cs35l56-shared.c

index 033e56d5e9db4ae848c5e61dde9457721923ce6d..ea724101cdd1a8f73ee69b691de7fb9b76348bfb 100644 (file)
@@ -851,9 +851,11 @@ out_sync:
 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;
 }