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

Commit 72bc7ae0 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mark Brown
Browse files

spi: s3c64xx: potential oops on probe error 



We accidentally mixed up freeing the rx and tx channels which would a
leak and an oops.

Fixes: 3d63a47a ("spi: s3c64xx: Don't request/release DMA channels for each SPI transfer")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarAndi Shyti <andi.shyti@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3d63a47a

drivers/spi/spi-s3c64xx.c

+4 −4
Original line number Diff line number Diff line
@@ -1147,7 +1147,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) 
		if (IS_ERR(sdd->tx_dma.ch)) {

			dev_err(&pdev->dev, "Failed to get TX DMA channel\n");

			ret = PTR_ERR(sdd->tx_dma.ch);

			goto err_release_tx_dma;

			goto err_release_rx_dma;

		}

	}
@@ -1196,11 +1196,11 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

	pm_runtime_set_suspended(&pdev->dev);



	if (!is_polling(sdd))

		dma_release_channel(sdd->rx_dma.ch);

err_release_tx_dma:

	if (!is_polling(sdd))

		dma_release_channel(sdd->tx_dma.ch);

err_release_rx_dma:

	if (!is_polling(sdd))

		dma_release_channel(sdd->rx_dma.ch);

err_disable_io_clk:

	clk_disable_unprepare(sdd->ioclk);

err_disable_src_clk: