summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sound/soc/codecs/rt712-sdca-sdw.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/sound/soc/codecs/rt712-sdca-sdw.c b/sound/soc/codecs/rt712-sdca-sdw.c
index ebdf7b308331..e23501ed87a7 100644
--- a/sound/soc/codecs/rt712-sdca-sdw.c
+++ b/sound/soc/codecs/rt712-sdca-sdw.c
@@ -473,22 +473,20 @@ static int rt712_sdca_dev_resume(struct device *dev)
regcache_cache_only(rt712->regmap, false);
ret = regcache_sync(rt712->regmap);
- if (ret)
- goto err_sync;
+ if (ret) {
+ regcache_cache_only(rt712->regmap, true);
+ return ret;
+ }
regcache_cache_only(rt712->mbq_regmap, false);
ret = regcache_sync(rt712->mbq_regmap);
- if (ret)
- goto err_sync;
+ if (ret) {
+ regcache_cache_only(rt712->mbq_regmap, true);
+ regcache_cache_only(rt712->regmap, true);
+ return ret;
+ }
return 0;
-
-err_sync:
- regcache_cache_only(rt712->regmap, true);
- regcache_cache_only(rt712->mbq_regmap, true);
- regcache_mark_dirty(rt712->regmap);
- regcache_mark_dirty(rt712->mbq_regmap);
- return ret;
}
static const struct dev_pm_ops rt712_sdca_pm = {