Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752645AbcCKV3E (ORCPT ); Fri, 11 Mar 2016 16:29:04 -0500 Received: from mail.ispras.ru ([83.149.199.45]:50826 "EHLO mail.ispras.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752040AbcCKV3B (ORCPT ); Fri, 11 Mar 2016 16:29:01 -0500 From: Alexey Khoroshilov To: Dan Williams , Vinod Koul , Yuan Yao Cc: Alexey Khoroshilov , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org Subject: [PATCH] dmaengine: fsl-edma: disable clks in case of failure in probe Date: Sat, 12 Mar 2016 00:28:39 +0300 Message-Id: <1457731719-27865-1-git-send-email-khoroshilov@ispras.ru> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2569 Lines: 85 fsl_edma_probe() does not disable already enabled clocks in case of failure. The patch fixes that. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov --- drivers/dma/fsl-edma.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c index be2e62b87948..58271302e43d 100644 --- a/drivers/dma/fsl-edma.c +++ b/drivers/dma/fsl-edma.c @@ -885,20 +885,23 @@ static int fsl_edma_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 1 + i); fsl_edma->muxbase[i] = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(fsl_edma->muxbase[i])) - return PTR_ERR(fsl_edma->muxbase[i]); + if (IS_ERR(fsl_edma->muxbase[i])) { + ret = PTR_ERR(fsl_edma->muxbase[i]); + goto err_clk; + } sprintf(clkname, "dmamux%d", i); fsl_edma->muxclk[i] = devm_clk_get(&pdev->dev, clkname); if (IS_ERR(fsl_edma->muxclk[i])) { dev_err(&pdev->dev, "Missing DMAMUX block clock.\n"); - return PTR_ERR(fsl_edma->muxclk[i]); + ret = PTR_ERR(fsl_edma->muxclk[i]); + goto err_clk; } ret = clk_prepare_enable(fsl_edma->muxclk[i]); if (ret) { dev_err(&pdev->dev, "DMAMUX clk block failed.\n"); - return ret; + goto err_clk; } } @@ -923,7 +926,7 @@ static int fsl_edma_probe(struct platform_device *pdev) edma_writel(fsl_edma, ~0, fsl_edma->membase + EDMA_INTR); ret = fsl_edma_irq_init(pdev, fsl_edma); if (ret) - return ret; + goto err_allclk; dma_cap_set(DMA_PRIVATE, fsl_edma->dma_dev.cap_mask); dma_cap_set(DMA_SLAVE, fsl_edma->dma_dev.cap_mask); @@ -952,20 +955,28 @@ static int fsl_edma_probe(struct platform_device *pdev) ret = dma_async_device_register(&fsl_edma->dma_dev); if (ret) { dev_err(&pdev->dev, "Can't register Freescale eDMA engine.\n"); - return ret; + goto err_allclk; } ret = of_dma_controller_register(np, fsl_edma_xlate, fsl_edma); if (ret) { dev_err(&pdev->dev, "Can't register Freescale eDMA of_dma.\n"); - dma_async_device_unregister(&fsl_edma->dma_dev); - return ret; + goto err_async; } /* enable round robin arbitration */ edma_writel(fsl_edma, EDMA_CR_ERGA | EDMA_CR_ERCA, fsl_edma->membase + EDMA_CR); return 0; + +err_async: + dma_async_device_unregister(&fsl_edma->dma_dev); +err_allclk: + i = DMAMUX_NR; +err_clk: + while (--i >= 0) + clk_disable_unprepare(fsl_edma->muxclk[i]); + return ret; } static int fsl_edma_remove(struct platform_device *pdev) -- 1.9.1