projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
62e228e
)
dmaengine: stm32-dmamux: Fix PM disable depth imbalance in stm32_dmamux_probe
author
Miaoqian Lin
<linmq006@gmail.com>
Sat, 8 Jan 2022 08:53:36 +0000
(08:53 +0000)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 23 Feb 2022 11:03:21 +0000
(12:03 +0100)
commit
e831c7aba950f3ae94002b10321279654525e5ec
upstream.
The pm_runtime_enable will increase power disable depth.
If the probe fails, we should use pm_runtime_disable() to balance
pm_runtime_enable().
Fixes:
4f3ceca254e0
("dmaengine: stm32-dmamux: Add PM Runtime support")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Reviewed-by: Amelie Delaunay <amelie.delaunay@foss.st.com>
Link:
https://lore.kernel.org/r/20220108085336.11992-1-linmq006@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/dma/stm32-dmamux.c
patch
|
blob
|
history
diff --git
a/drivers/dma/stm32-dmamux.c
b/drivers/dma/stm32-dmamux.c
index
a421643
..
d5d5573
100644
(file)
--- 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)
ret = of_dma_router_register(node, stm32_dmamux_route_allocate,
&stm32_dmamux->dmarouter);
if (ret)
- goto
err_clk
;
+ goto
pm_disable
;
return 0;
return 0;
+pm_disable:
+ pm_runtime_disable(&pdev->dev);
err_clk:
clk_disable_unprepare(stm32_dmamux->clk);
err_clk:
clk_disable_unprepare(stm32_dmamux->clk);