From a1a131fa32c6fe21ab0d4cc89bece1215aa1fb2b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 22 Nov 2012 18:22:59 +0100
Subject: [PATCH] --- yaml --- r: 344332 b: refs/heads/master c:
 73d9cdca1ced6ab32be363b58699039bd82b062a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1196f4856686..a901acdd832a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8eb9e7d2a198fe3a0f76d9e5b374160c26e4621
+refs/heads/master: 73d9cdca1ced6ab32be363b58699039bd82b062a
diff --git a/trunk/drivers/dma/mv_xor.c b/trunk/drivers/dma/mv_xor.c
index f2edd6a5536e..9659e58fc8b2 100644
--- a/trunk/drivers/dma/mv_xor.c
+++ b/trunk/drivers/dma/mv_xor.c
@@ -1322,6 +1322,7 @@ static int __devinit mv_xor_probe(struct platform_device *pdev)
 						   cap_mask, irq);
 			if (IS_ERR(xordev->channels[i])) {
 				ret = PTR_ERR(xordev->channels[i]);
+				xordev->channels[i] = NULL;
 				irq_dispose_mapping(irq);
 				goto err_channel_add;
 			}