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

dma: mv_xor: fix error handling of mv_xor_channel_add()



When mv_xor_channel_add() fails for one XOR channel, we jump to the
err_channel_add label to clean up all previous channels that had been
initialized correctly. Unfortunately, while handling this error
condition, we were disposing the IRQ mapping before calling
mv_xor_channel_remove() (which does the free_irq()), which is
incorrect.

Instead, do things properly in the reverse order of the
initialization: first remove the XOR channel (so that free_irq() is
done), and then dispose the IRQ mapping.

This avoids ugly warnings when for some reason one of the XOR channel
fails to initialize.

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

parent 41be8dc1

drivers/dma/mv_xor.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1361,9 +1361,9 @@ static int mv_xor_probe(struct platform_device *pdev)
		err_channel_add:
		for (i = 0; i < MV_XOR_MAX_CHANNELS; i++)
		if (xordev->channels[i]) {
		mv_xor_channel_remove(xordev->channels[i]);
		if (pdev->dev.of_node)
		irq_dispose_mapping(xordev->channels[i]->irq);
		mv_xor_channel_remove(xordev->channels[i]);
		}

		clk_disable_unprepare(xordev->clk);

Admin message