Merge remote-tracking branch 'keys/keys-next'

[deliverable/linux.git] / sound / soc / rockchip / rockchip_spdif.c

diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c
index 4ca265737edaaf3def95014793f6837d9de065b0..fa8101d1e16f276b2e5e7a8e70cbb2ab384ad9be 100644 (file)
--- a/sound/soc/rockchip/rockchip_spdif.c
+++ b/sound/soc/rockchip/rockchip_spdif.c
@@ -65,6 +65,7 @@ static int __maybe_unused rk_spdif_runtime_suspend(struct device *dev)
 {
        struct rk_spdif_dev *spdif = dev_get_drvdata(dev);
 
+       regcache_cache_only(spdif->regmap, true);
        clk_disable_unprepare(spdif->mclk);
        clk_disable_unprepare(spdif->hclk);
 
@@ -88,7 +89,16 @@ static int __maybe_unused rk_spdif_runtime_resume(struct device *dev)
                return ret;
        }
 
-       return 0;
+       regcache_cache_only(spdif->regmap, false);
+       regcache_mark_dirty(spdif->regmap);
+
+       ret = regcache_sync(spdif->regmap);
+       if (ret) {
+               clk_disable_unprepare(spdif->mclk);
+               clk_disable_unprepare(spdif->hclk);
+       }
+
+       return ret;
 }
 
 static int rk_spdif_hw_params(struct snd_pcm_substream *substream,