Commit 1dbe67b9 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Vinod Koul
Browse files

dmaengine: lgm: Fix an error handling path in intel_ldma_probe() 



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: 32d31c79 ("dmaengine: Add Intel LGM SoC DMA support.")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/18504549bc4d2b62a72a02cb22a2e4d8e6a58720.1653241224.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent b64b3b2f

drivers/dma/lgm/lgm-dma.c

+2 −1
Original line number Diff line number Diff line
@@ -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);