]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
spi: s3c64xx: potential oops on probe error
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 13 Jan 2017 07:42:53 +0000 (10:42 +0300)
committerMark Brown <broonie@kernel.org>
Tue, 17 Jan 2017 17:58:51 +0000 (17:58 +0000)
We accidentally mixed up freeing the rx and tx channels which would a
leak and an oops.

Fixes: 3d63a47a380a ("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>
drivers/spi/spi-s3c64xx.c

index 849ee82483e4b4715b92e65645543061586a3d5f..b8cd356d8d100c101cbfd9c10637869f2616e2b0 100644 (file)
@@ -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 @@ err_pm_put:
        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: