Commit dab92064 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper

dma: mv_xor: fix error handling for clocks

When a channel fails to initialize, we release all ressources,
including clocks. However, a XOR unit is not necessarily associated to
a clock (some variants of Marvell SoCs have a clock for XOR units,
some don't), so we shouldn't unconditionally be releasing the clock.

Instead, just like we do in the mv_xor_remove() function, we should
check if one clock was found before releasing it.
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent ab6e439f
...@@ -1366,8 +1366,11 @@ static int mv_xor_probe(struct platform_device *pdev) ...@@ -1366,8 +1366,11 @@ static int mv_xor_probe(struct platform_device *pdev)
irq_dispose_mapping(xordev->channels[i]->irq); irq_dispose_mapping(xordev->channels[i]->irq);
} }
if (!IS_ERR(xordev->clk)) {
clk_disable_unprepare(xordev->clk); clk_disable_unprepare(xordev->clk);
clk_put(xordev->clk); clk_put(xordev->clk);
}
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment