summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Jingjin <wangjingjin1@huawei.com>2022-12-05 11:28:02 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-01-18 11:30:38 +0100
commitba60b60379917a7363bad0ad3df998b9477e6a55 (patch)
tree032abbaa74fc8044c99bbb0e22bd87ab766a2877
parent3fe17bc69dc6dc6c20a0c52d4e659f449457d200 (diff)
downloadlinux-stable-ba60b60379917a7363bad0ad3df998b9477e6a55.tar.gz
linux-stable-ba60b60379917a7363bad0ad3df998b9477e6a55.tar.bz2
linux-stable-ba60b60379917a7363bad0ad3df998b9477e6a55.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>
-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 ad16c8310dd3..7dfd1e6b2c25 100644
--- a/sound/soc/rockchip/rockchip_pdm.c
+++ b/sound/soc/rockchip/rockchip_pdm.c
@@ -303,6 +303,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;
}