]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
spi: tegra20-slink: add missed clk_unprepare
authorChuhong Yuan <hslester96@gmail.com>
Fri, 15 Nov 2019 08:31:22 +0000 (16:31 +0800)
committerSeth Forshee <seth.forshee@canonical.com>
Mon, 6 Jan 2020 14:16:44 +0000 (08:16 -0600)
BugLink: https://bugs.launchpad.net/bugs/1858428
[ Upstream commit 04358e40ba96d687c0811c21d9dede73f5244a98 ]

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: Sasha Levin <sashal@kernel.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
drivers/spi/spi-tegra20-slink.c

index 111fffc91435c1a85ca0785ef91280ba776ede5f..374a2a32edcd31dda15190b01a15b71f094c2d42 100644 (file)
@@ -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 @@ exit_free_irq:
        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);