diff options
| author | Tobias Jordan <Tobias.Jordan@elektrobit.com> | 2017-12-06 08:28:27 -0500 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2017-12-10 22:30:06 -0500 |
| commit | eb9436966fdc84cebdf222952a99898ab46d9bb0 (patch) | |
| tree | 086fe66462a5cf2ec0549ff2d86f23156c5be9c2 | |
| parent | 6f6a23a213be51728502b88741ba6a10cda2441d (diff) | |
dmaengine: jz4740: disable/unprepare clk if probe fails
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>
| -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) | |||
| 555 | 555 | ||
| 556 | ret = dma_async_device_register(dd); | 556 | ret = dma_async_device_register(dd); |
| 557 | if (ret) | 557 | if (ret) |
| 558 | return ret; | 558 | goto err_clk; |
| 559 | 559 | ||
| 560 | irq = platform_get_irq(pdev, 0); | 560 | irq = platform_get_irq(pdev, 0); |
| 561 | ret = request_irq(irq, jz4740_dma_irq, 0, dev_name(&pdev->dev), dmadev); | 561 | 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) | |||
| 568 | 568 | ||
| 569 | err_unregister: | 569 | err_unregister: |
| 570 | dma_async_device_unregister(dd); | 570 | dma_async_device_unregister(dd); |
| 571 | err_clk: | ||
| 572 | clk_disable_unprepare(dmadev->clk); | ||
| 571 | return ret; | 573 | return ret; |
| 572 | } | 574 | } |
| 573 | 575 | ||
