mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
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: 3d63a47a38
("spi: s3c64xx: Don't request/release DMA channels for each SPI transfer")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Andi Shyti <andi.shyti@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
3d63a47a38
commit
72bc7ae063
1 changed files with 4 additions and 4 deletions
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue