summaryrefslogtreecommitdiffstats
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorWang Jingjin <wangjingjin1@huawei.com>2022-12-05 11:28:02 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-12-31 13:33:06 +0100
commitbebbba710321f7c5f606c1628b3543141753a4d8 (patch)
tree9a0043c1c00fa2ce2f747f7a84e64ef0306b4912 /sound/soc/rockchip
parent4cc8431ec77a43ea106d8bde0860c61cfdda1cd0 (diff)
downloadlinux-stable-bebbba710321f7c5f606c1628b3543141753a4d8.tar.gz
linux-stable-bebbba710321f7c5f606c1628b3543141753a4d8.tar.bz2
linux-stable-bebbba710321f7c5f606c1628b3543141753a4d8.zip
ASoC: rockchip: pdm: Add missing clk_disable_unprepare() in rockchip_pdm_runtime_resume()
[ Upstream commit ef0a098efb36660326c133af9b5a04a96a00e3ca ] The clk_disable_unprepare() should be called in the error handling of rockchip_pdm_runtime_resume(). Fixes: fc05a5b22253 ("ASoC: rockchip: add support for pdm controller") Signed-off-by: Wang Jingjin <wangjingjin1@huawei.com> Link: https://lore.kernel.org/r/20221205032802.2422983-1-wangjingjin1@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound/soc/rockchip')
-rw-r--r--sound/soc/rockchip/rockchip_pdm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c
index a7549f827235..5b1e47bdc376 100644
--- a/sound/soc/rockchip/rockchip_pdm.c
+++ b/sound/soc/rockchip/rockchip_pdm.c
@@ -431,6 +431,7 @@ static int rockchip_pdm_runtime_resume(struct device *dev)
ret = clk_prepare_enable(pdm->hclk);
if (ret) {
+ clk_disable_unprepare(pdm->clk);
dev_err(pdm->dev, "hclock enable failed %d\n", ret);
return ret;
}