From 09c3478a0a96386642c5dcbbf2f0eea11880cd75 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:10:43 +0100
Subject: [PATCH] --- yaml --- r: 348469 b: refs/heads/master c:
 ab6e439fd07aba7cadcadb3fb5e11d3758e19679 h: refs/heads/master i:   348467:
 e4785f1caaa949a5f9e9eb87fbfea0f196344133 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/dma/mv_xor.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 78b62cdc69c2..789e77de0b04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41be8dc1a44ee2a0a52bdf2b77273624c40782b6
+refs/heads/master: ab6e439fd07aba7cadcadb3fb5e11d3758e19679
diff --git a/trunk/drivers/dma/mv_xor.c b/trunk/drivers/dma/mv_xor.c
index ac71f555dd72..cc5d23d3addd 100644
--- a/trunk/drivers/dma/mv_xor.c
+++ b/trunk/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);