xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: meson-spicc: fix a wrong goto jump for avoiding memory leak.

Browse Source 
[ Upstream commit 95730d5eb73170a6d225a9998c478be273598634 ]

In meson_spifc_probe function, when enable the device pclk clock is
error, it should use clk_disable_unprepare to release the core clock.

Signed-off-by: zpershuai <zpershuai@gmail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://lore.kernel.org/r/1623562172-22056-1-git-send-email-zpershuai@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
zpershuai
2021-06-13 13:29:32 +08:00
committed by Greg Kroah-Hartman
parent ea7e1b581b
commit a0bbb5d378
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/spi/spi-meson-spicc.c
View File

@@ -725,7 +725,7 @@ static int meson_spicc_probe(struct platform_device *pdev)
ret = clk_prepare_enable(spicc->pclk); ret = clk_prepare_enable(spicc->pclk);
if (ret) { if (ret) {
dev_err(&pdev->dev, "pclk clock enable failed\n"); dev_err(&pdev->dev, "pclk clock enable failed\n");
goto out_master; goto out_core_clk;
} }
device_reset_optional(&pdev->dev); device_reset_optional(&pdev->dev);
@@ -764,9 +764,11 @@ static int meson_spicc_probe(struct platform_device *pdev)
return 0; return 0;
out_clk: out_clk:
clk_disable_unprepare(spicc->core);
clk_disable_unprepare(spicc->pclk); clk_disable_unprepare(spicc->pclk);
out_core_clk:
clk_disable_unprepare(spicc->core);
out_master: out_master:
spi_master_put(master); spi_master_put(master);