Commit dab92064 authored Jan 06, 2013 by Thomas Petazzoni Committed by Jason Cooper Jan 06, 2013

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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

parent ab6e439f

drivers/dma/mv_xor.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1366,8 +1366,11 @@ err_channel_add:
		irq_dispose_mapping(xordev->channels[i]->irq);
		}

		if (!IS_ERR(xordev->clk)) {
		clk_disable_unprepare(xordev->clk);
		clk_put(xordev->clk);
		}

		return ret;
		}