[PATCH] ASoC: max98520: Handle reset and register restore errors on resume
From: Zhu Jun
Date: Thu Nov 19 2026 - 02:59:24 EST
max98520_resume() ignores errors from both the software reset and
the register cache sync. A failed I2C transfer can therefore leave
the amplifier incorrectly configured while resume reports success.
Restore the register cache only after the reset write succeeds. On
either error, restore cache-only mode and return the error.
Fixes: f88ee76b8645 ("ASoC: max98520: add max98520 audio amplifier driver")
Signed-off-by: Zhu Jun <zhujun2@xxxxxxxxxxxxxxxxxxxx>
---
sound/soc/codecs/max98520.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/max98520.c b/sound/soc/codecs/max98520.c
index 56e559db88de..a1996568dda4 100644
--- a/sound/soc/codecs/max98520.c
+++ b/sound/soc/codecs/max98520.c
@@ -643,11 +643,16 @@ static int max98520_suspend(struct device *dev)
static int max98520_resume(struct device *dev)
{
struct max98520_priv *max98520 = dev_get_drvdata(dev);
+ int ret;
regcache_cache_only(max98520->regmap, false);
- regmap_write(max98520->regmap, MAX98520_R2000_SW_RESET, 1);
- regcache_sync(max98520->regmap);
- return 0;
+ ret = regmap_write(max98520->regmap, MAX98520_R2000_SW_RESET, 1);
+ if (!ret)
+ ret = regcache_sync(max98520->regmap);
+ if (ret)
+ regcache_cache_only(max98520->regmap, true);
+
+ return ret;
}
static const struct dev_pm_ops max98520_pm = {