summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPengpeng Hou <pengpeng@iscas.ac.cn>2026-07-04 11:57:05 +0800
committerMark Brown <broonie@kernel.org>2026-07-09 17:45:26 +0100
commit70f88374e4e40d851a8a36bc2a6138697bbfcb5a (patch)
treee19c74b97ab3545b397ff89387bc3c9bc5f90b63
parentaeb606a6437dfed9a98a6c2b056f9086a881f210 (diff)
ASoC: codecs: tas2552: Propagate regcache_sync() errors
regcache_sync() can fail while replaying cached register state after runtime resume. tas2552_runtime_resume() currently ignores that failure and returns success. Propagate the error, restore cache-only/dirty state, and put the amplifier back into shutdown on sync failure. Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn> Link: https://patch.msgid.link/20260704035705.77946-1-pengpeng@iscas.ac.cn Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/tas2552.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c
index 1a7650b9b2a7..22f93e29454f 100644
--- a/sound/soc/codecs/tas2552.c
+++ b/sound/soc/codecs/tas2552.c
@@ -495,13 +495,21 @@ static int tas2552_runtime_suspend(struct device *dev)
static int tas2552_runtime_resume(struct device *dev)
{
struct tas2552_data *tas2552 = dev_get_drvdata(dev);
+ int ret;
gpiod_set_value_cansleep(tas2552->enable_gpio, 1);
tas2552_sw_shutdown(tas2552, 0);
regcache_cache_only(tas2552->regmap, false);
- regcache_sync(tas2552->regmap);
+ ret = regcache_sync(tas2552->regmap);
+ if (ret) {
+ regcache_cache_only(tas2552->regmap, true);
+ regcache_mark_dirty(tas2552->regmap);
+ tas2552_sw_shutdown(tas2552, 1);
+ gpiod_set_value_cansleep(tas2552->enable_gpio, 0);
+ return ret;
+ }
return 0;
}