Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd1f4a58 authored by Chuhong Yuan's avatar Chuhong Yuan Committed by Greg Kroah-Hartman
Browse files

spi: tegra20-slink: add missed clk_unprepare 



[ Upstream commit 04358e40ba96d687c0811c21d9dede73f5244a98 ]

The driver misses calling clk_unprepare in probe failure and remove.
Add the calls to fix it.

Signed-off-by: default avatarChuhong Yuan <hslester96@gmail.com>
Link: https://lore.kernel.org/r/20191115083122.12278-1-hslester96@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 83a9fb54

drivers/spi/spi-tegra20-slink.c

+4 −1
Original line number Diff line number Diff line
@@ -1078,7 +1078,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);
@@ -1151,6 +1151,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;
@@ -1164,6 +1166,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);