diff options
| author | Tobias Jordan <Tobias.Jordan@elektrobit.com> | 2017-12-06 14:28:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-25 11:08:03 +0100 |
| commit | 58d3cc9687f5baf704c866d61af302c50d302d91 (patch) | |
| tree | a30651085e91ceb34c1dcbbbe6d98674f95ffe0a /drivers/dma | |
| parent | 4826773306b5275055632a59eda7957ae543eecd (diff) | |
| download | linux-stable-58d3cc9687f5baf704c866d61af302c50d302d91.tar.gz linux-stable-58d3cc9687f5baf704c866d61af302c50d302d91.tar.bz2 linux-stable-58d3cc9687f5baf704c866d61af302c50d302d91.zip | |
dmaengine: jz4740: disable/unprepare clk if probe fails
[ Upstream commit eb9436966fdc84cebdf222952a99898ab46d9bb0 ]
in error path of jz4740_dma_probe(), call clk_disable_unprepare() to clean
up.
Found by Linux Driver Verification project (linuxtesting.org).
Fixes: 25ce6c35fea0 MIPS: jz4740: Remove custom DMA API
Signed-off-by: Tobias Jordan <Tobias.Jordan@elektrobit.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/dma-jz4740.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/dma-jz4740.c b/drivers/dma/dma-jz4740.c index d50273fed715..afd5e10f8927 100644 --- a/drivers/dma/dma-jz4740.c +++ b/drivers/dma/dma-jz4740.c @@ -555,7 +555,7 @@ static int jz4740_dma_probe(struct platform_device *pdev) ret = dma_async_device_register(dd); if (ret) - return ret; + goto err_clk; irq = platform_get_irq(pdev, 0); ret = request_irq(irq, jz4740_dma_irq, 0, dev_name(&pdev->dev), dmadev); @@ -568,6 +568,8 @@ static int jz4740_dma_probe(struct platform_device *pdev) err_unregister: dma_async_device_unregister(dd); +err_clk: + clk_disable_unprepare(dmadev->clk); return ret; } |