projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b64b3b2
)
dmaengine: lgm: Fix an error handling path in intel_ldma_probe()
author
Christophe JAILLET
<christophe.jaillet@wanadoo.fr>
Sun, 22 May 2022 17:41:05 +0000
(19:41 +0200)
committer
Vinod Koul
<vkoul@kernel.org>
Wed, 6 Jul 2022 05:23:25 +0000
(10:53 +0530)
ldma_clk_disable() calls both:
clk_disable_unprepare(d->core_clk);
reset_control_assert(d->rst);
So, should devm_reset_control_get_optional() fail, core_clk should not
be prepare_enable'd before it, otherwise it will never be
disable_unprepare'd.
Reorder the code to handle the error handling path as expected.
Fixes:
32d31c79a1a4
("dmaengine: Add Intel LGM SoC DMA support.")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link:
https://lore.kernel.org/r/18504549bc4d2b62a72a02cb22a2e4d8e6a58720.1653241224.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/lgm/lgm-dma.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/dma/lgm/lgm-dma.c
b/drivers/dma/lgm/lgm-dma.c
index efe8bd3a0e2aa5c14a0f49fd9154d0930fd56196..9b9184f964be397a4f5f5b8a7a1c2410032d6456 100644
(file)
--- a/
drivers/dma/lgm/lgm-dma.c
+++ b/
drivers/dma/lgm/lgm-dma.c
@@
-1593,11
+1593,12
@@
static int intel_ldma_probe(struct platform_device *pdev)
d->core_clk = devm_clk_get_optional(dev, NULL);
if (IS_ERR(d->core_clk))
return PTR_ERR(d->core_clk);
- clk_prepare_enable(d->core_clk);
d->rst = devm_reset_control_get_optional(dev, NULL);
if (IS_ERR(d->rst))
return PTR_ERR(d->rst);
+
+ clk_prepare_enable(d->core_clk);
reset_control_deassert(d->rst);
ret = devm_add_action_or_reset(dev, ldma_clk_disable, d);