From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752166AbdLFNue (ORCPT ); Wed, 6 Dec 2017 08:50:34 -0500 Received: from 178.115.242.59.static.drei.at ([178.115.242.59]:53909 "EHLO mail.osadl.at" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751601AbdLFNub (ORCPT ); Wed, 6 Dec 2017 08:50:31 -0500 From: Andreas Platschek To: vinod.koul@intel.com Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, dan.j.williams@intel.com, Andreas Platschek Subject: [PATCH v2] dmaengine: fsl-edma: disable clks on all error paths Date: Wed, 6 Dec 2017 14:50:23 +0100 Message-Id: <1512568223-13258-1-git-send-email-andreas.platschek@opentech.at> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Previously enabled clks are only disabled if clk_prepare_enable() fails. However, there are other error paths were the previously enabled clocks are not disabled. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Andreas Platschek --- drivers/dma/fsl-edma.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c index 6775f2c74e25..9940f2f7039f 100644 --- a/drivers/dma/fsl-edma.c +++ b/drivers/dma/fsl-edma.c @@ -878,7 +878,7 @@ static int fsl_edma_probe(struct platform_device *pdev) struct fsl_edma_chan *fsl_chan; struct resource *res; int len, chans; - int ret, i; + int ret, i, j; ret = of_property_read_u32(np, "dma-channels", &chans); if (ret) { @@ -904,12 +904,21 @@ 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])) + if (IS_ERR(fsl_edma->muxbase[i])) { + /* disable only clks which were enabled on error */ + for (j = i-1; j >= 0; j--) + clk_disable_unprepare(fsl_edma->muxclk[j]); + return PTR_ERR(fsl_edma->muxbase[i]); + } sprintf(clkname, "dmamux%d", i); fsl_edma->muxclk[i] = devm_clk_get(&pdev->dev, clkname); if (IS_ERR(fsl_edma->muxclk[i])) { + /* disable only clks which were enabled on error */ + for (j = i-1; j >= 0; j--) + clk_disable_unprepare(fsl_edma->muxclk[j]); + dev_err(&pdev->dev, "Missing DMAMUX block clock.\n"); return PTR_ERR(fsl_edma->muxclk[i]); } -- 2.11.0