Skip to content

Commit

Permalink
dmaengine: lgm: Fix an error handling path in intel_ldma_probe()
Browse files Browse the repository at this point in the history
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: 32d31c7 ("dmaengine: Add Intel LGM SoC DMA support.")
Signed-off-by: Christophe JAILLET <[email protected]>
Link: https://lore.kernel.org/r/18504549bc4d2b62a72a02cb22a2e4d8e6a58720.1653241224.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Vinod Koul <[email protected]>
  • Loading branch information
tititiou36 authored and vinodkoul committed Jul 6, 2022
1 parent b64b3b2 commit 1dbe67b
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/dma/lgm/lgm-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 1dbe67b

Please sign in to comment.