diff options
| author | Vinod Koul <vkoul@kernel.org> | 2022-03-10 10:12:25 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2022-03-10 10:12:25 +0530 |
| commit | 60c10db9b17330eb43b84a8051a77ab1e6074442 (patch) | |
| tree | 3f696f5851e20c13446e6fade12217e542d8b472 /drivers/dma/stm32-dmamux.c | |
| parent | ea7c8f598c323f6ebaf9ddae01fb2a981fe8c56a (diff) | |
| parent | 455896c53d5b803733ddd84e1bf8a430644439b6 (diff) | |
Merge tag 'dmaengine-fix-5.17' into next
This merges dmaengine/dmaengine-fix-5.17 tag into next as that is
already merged mainline and resolves depencency in patches
Diffstat (limited to 'drivers/dma/stm32-dmamux.c')
| -rw-r--r-- | drivers/dma/stm32-dmamux.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/stm32-dmamux.c b/drivers/dma/stm32-dmamux.c index a42164389ebc2..d5d55732adba1 100644 --- a/drivers/dma/stm32-dmamux.c +++ b/drivers/dma/stm32-dmamux.c @@ -292,10 +292,12 @@ static int stm32_dmamux_probe(struct platform_device *pdev) ret = of_dma_router_register(node, stm32_dmamux_route_allocate, &stm32_dmamux->dmarouter); if (ret) - goto err_clk; + goto pm_disable; return 0; +pm_disable: + pm_runtime_disable(&pdev->dev); err_clk: clk_disable_unprepare(stm32_dmamux->clk); |