ASoC: rockchip: i2s: Fix missing clk_disable_unprepare() in rockchip_i2s_probe
Subsystems (3)
PATCH 1/1 ASoC: rockchip: i2s: Fix missing clk_disable_unprepare() in rockchip_i2s_probe
Fix the missing clk_disable_unprepare() before return from rockchip_i2s_probe() in the error handling case.
--- sound/soc/rockchip/rockchip_i2s.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
sound/soc/rockchip/rockchip_i2s.c +10 -5
@@ -716,19 +716,23 @@ static int rockchip_i2s_probe(struct platform_device *pdev) i2s->mclk =devm_clk_get (&pdev->dev,"i2s_clk" );if (IS_ERR (i2s->mclk)) {dev_err (&pdev->dev,"Can't retrieve i2s master clock\n" ); -return PTR_ERR (i2s->mclk); + ret =PTR_ERR (i2s->mclk); + goto err_clk; } regs =devm_platform_get_and_ioremap_resource (pdev,0 , &res); -if (IS_ERR (regs)) -return PTR_ERR (regs); +if (IS_ERR (regs)) { + ret =PTR_ERR (regs); + goto err_clk; + } i2s->regmap =devm_regmap_init_mmio (&pdev->dev, regs, &rockchip_i2s_regmap_config);if (IS_ERR (i2s->regmap)) {dev_err (&pdev->dev,"Failed to initialise managed register map\n" ); -return PTR_ERR (i2s->regmap); + ret =PTR_ERR (i2s->regmap); + goto err_clk; } i2s->bclk_ratio =64 ;
@@ -768,7 +772,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev)i2s_runtime_suspend (&pdev->dev); err_pm_disable:pm_runtime_disable (&pdev->dev); - +err_clk: +clk_disable_unprepare (i2s->hclk);return ret; }
Signature · 1 line
2.17.1
Mark Brown
maintainerQuoted 4 lines · Miaoqian Lin
Fix the missing
clk_disable_unprepare()before return fromrockchip_i2s_probe()in the error handling case.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: rockchip: i2s: Fix missing clk_disable_unprepare() in rockchip_i2s_probe
commit: f725d20579807a68afbe5dba69e78b8fa05f5ef0
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark