nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 10:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: tegra-alt: use devm_clk_put and not clk_put

Browse Source 
Use the devm_clk_put function instead of clk_put i
to avoid kernel panic when clk_get fails

Bug 1687658

Change-Id: I2ab31667dfdec4298d87a9a1d2d427954880b41d
(cherry picked from commit 2874a4278430d482b0309b954c36e7300807f9ae)
Reviewed-on: http://git-master/r/802540
Signed-off-by: Asha T <atalambedu@nvidia.com>
Reviewed-on: http://git-master/r/807794
Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com>
This commit is contained in:
Mohan Kumar
2015-09-21 17:29:21 -07:00
committed by Sameer Pujar
parent 4adc0e323f
commit 6db8dd359c
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/tegra-alt/tegra210_i2s_alt.c
View File

@@ -1088,7 +1088,11 @@ err_pm_disable:
pm_runtime_disable(&pdev->dev);
err_pll_a_out0_clk_put:
if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga()))
#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
clk_put(i2s->clk_pll_a_out0);
#else
devm_clk_put(&pdev->dev, i2s->clk_pll_a_out0);
#endif
err_audio_sync_clk_put:
devm_clk_put(&pdev->dev, i2s->clk_audio_sync);
err_i2s_sync_clk_put:

17
sound/soc/tegra-alt/tegra210_xbar_alt.c
View File

@@ -901,7 +901,7 @@ static int tegra210_xbar_probe(struct platform_device *pdev)
#else
xbar->clk_parent = devm_clk_get(&pdev->dev, "pll_a_out0");
#endif
if (IS_ERR(xbar->clk)) {
if (IS_ERR(xbar->clk_parent)) {
dev_err(&pdev->dev, "Can't retrieve pll_a_out0 clock\n");
ret = PTR_ERR(xbar->clk_parent);
goto err_clk_put;
@@ -927,7 +927,7 @@ static int tegra210_xbar_probe(struct platform_device *pdev)
}
if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) {
ret = clk_set_rate(xbar->clk_parent, 24560000);
ret = clk_set_rate(xbar->clk_parent, 24576000);
if (ret) {
dev_err(&pdev->dev, "Failed to set clock rate of pll_a_out0\n");
goto err_clk_put_ape;
@@ -996,11 +996,19 @@ err_pm_disable:
tegra_ape_pd_remove_device(&pdev->dev);
err_clk_set_parent:
clk_set_parent(xbar->clk, parent_clk);
#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
err_clk_put_ape:
clk_put(xbar->clk_ape);
err_clk_put_parent:
if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga()))
clk_put(xbar->clk_parent);
#else
err_clk_put_ape:
devm_clk_put(&pdev->dev, xbar->clk_ape);
err_clk_put_parent:
if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga()))
devm_clk_put(&pdev->dev, xbar->clk_parent);
#endif
err_clk_put:
devm_clk_put(&pdev->dev, xbar->clk);
err:
@@ -1018,8 +1026,13 @@ static int tegra210_xbar_remove(struct platform_device *pdev)
tegra_ape_pd_remove_device(&pdev->dev);
devm_clk_put(&pdev->dev, xbar->clk);
#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
clk_put(xbar->clk_parent);
clk_put(xbar->clk_ape);
#else
devm_clk_put(&pdev->dev, xbar->clk_parent);
devm_clk_put(&pdev->dev, xbar->clk_ape);
#endif
return 0;
}