This is a note to let you know that I've just added the patch titled
ASoC: rk817: Fix missing clk_disable_unprepare() in rk817_platform_probe
to the 5.17-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-rk817-fix-missing-clk_disable_unprepare-in-rk81.patch
and it can be found in the queue-5.17 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 0e8a600fb3d3ea5803d0157bf9278e4a8cdc0569
Author: Miaoqian Lin <linmq006@xxxxxxxxx>
Date: Mon Mar 7 09:01:30 2022 +0000
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@xxxxxxxxx>
Tested-by: Chris Morgan <macromorgan@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/20220307090146.4104-1-linmq006@xxxxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
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;
}
