| From 9e6393bc29d5a371d21c0806b67a198a31253aa8 Mon Sep 17 00:00:00 2001 |
| From: Chuhong Yuan <hslester96@gmail.com> |
| Date: Fri, 15 Nov 2019 16:31:22 +0800 |
| Subject: [PATCH] spi: tegra20-slink: add missed clk_unprepare |
| |
| commit 04358e40ba96d687c0811c21d9dede73f5244a98 upstream. |
| |
| The driver misses calling clk_unprepare in probe failure and remove. |
| Add the calls to fix it. |
| |
| Signed-off-by: Chuhong Yuan <hslester96@gmail.com> |
| Link: https://lore.kernel.org/r/20191115083122.12278-1-hslester96@gmail.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c |
| index 111fffc91435..374a2a32edcd 100644 |
| --- a/drivers/spi/spi-tegra20-slink.c |
| +++ b/drivers/spi/spi-tegra20-slink.c |
| @@ -1073,7 +1073,7 @@ static int tegra_slink_probe(struct platform_device *pdev) |
| ret = clk_enable(tspi->clk); |
| if (ret < 0) { |
| dev_err(&pdev->dev, "Clock enable failed %d\n", ret); |
| - goto exit_free_master; |
| + goto exit_clk_unprepare; |
| } |
| |
| spi_irq = platform_get_irq(pdev, 0); |
| @@ -1146,6 +1146,8 @@ static int tegra_slink_probe(struct platform_device *pdev) |
| free_irq(spi_irq, tspi); |
| exit_clk_disable: |
| clk_disable(tspi->clk); |
| +exit_clk_unprepare: |
| + clk_unprepare(tspi->clk); |
| exit_free_master: |
| spi_master_put(master); |
| return ret; |
| @@ -1159,6 +1161,7 @@ static int tegra_slink_remove(struct platform_device *pdev) |
| free_irq(tspi->irq, tspi); |
| |
| clk_disable(tspi->clk); |
| + clk_unprepare(tspi->clk); |
| |
| if (tspi->tx_dma_chan) |
| tegra_slink_deinit_dma_param(tspi, false); |
| -- |
| 2.7.4 |
| |
