summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMiaoqian Lin <linmq006@gmail.com>2022-03-07 12:01:30 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-04-08 15:23:21 +0300
commit39c2894dfc084972d85a6a211ca6ceb69bdc57d9 (patch)
treee8a07055e1f133ce7cc799cd5bc65c77d11ad9a5 /sound
parent87e04a89c31e792eef62bcba6ebb77fd323d28a1 (diff)
downloadlinux-39c2894dfc084972d85a6a211ca6ceb69bdc57d9.tar.xz
ASoC: rk817: Fix missing clk_disable_unprepare() in rk817_platform_probe
[ Upstream commit a6b44a2518a08348bd0f0401e4d2b99233bbabc2 ] Fix the missing clk_disable_unprepare() before return from rk817_platform_probe() in the error handling case. Fixes: 0d6a04da9b25 ("ASoC: Add Rockchip rk817 audio CODEC support") Signed-off-by: Miaoqian Lin <linmq006@gmail.com> Tested-by: Chris Morgan <macromorgan@hotmail.com> Link: https://lore.kernel.org/r/20220307090146.4104-1-linmq006@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/rk817_codec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c
index 03f24edfe4f6..8fffe378618d 100644
--- a/sound/soc/codecs/rk817_codec.c
+++ b/sound/soc/codecs/rk817_codec.c
@@ -508,12 +508,14 @@ static int rk817_platform_probe(struct platform_device *pdev)
if (ret < 0) {
dev_err(&pdev->dev, "%s() register codec error %d\n",
__func__, ret);
- goto err_;
+ goto err_clk;
}
return 0;
-err_:
+err_clk:
+ clk_disable_unprepare(rk817_codec_data->mclk);
+err_:
return ret;
}