From: Thomas Petazzoni Date: Sun, 6 Jan 2013 10:10:43 +0000 (+0100) Subject: dma: mv_xor: fix error handling of mv_xor_channel_add() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ab6e439fd07aba7cadcadb3fb5e11d3758e19679;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Jason Cooper --- diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index ac71f555dd72..cc5d23d3addd 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c @@ -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);