From c29a72848fc4c84d03395849d7f517cbe8f3094a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:10:44 +0100
Subject: [PATCH] --- yaml --- r: 348470 b: refs/heads/master c:
 dab9206445952e64213582b2ab9077972850d65b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 789e77de0b04..768a8d98346e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab6e439fd07aba7cadcadb3fb5e11d3758e19679
+refs/heads/master: dab9206445952e64213582b2ab9077972850d65b
diff --git a/trunk/drivers/dma/mv_xor.c b/trunk/drivers/dma/mv_xor.c
index cc5d23d3addd..e17fad03cb80 100644
--- a/trunk/drivers/dma/mv_xor.c
+++ b/trunk/drivers/dma/mv_xor.c
@@ -1366,8 +1366,11 @@ static int mv_xor_probe(struct platform_device *pdev)
 				irq_dispose_mapping(xordev->channels[i]->irq);
 		}
 
-	clk_disable_unprepare(xordev->clk);
-	clk_put(xordev->clk);
+	if (!IS_ERR(xordev->clk)) {
+		clk_disable_unprepare(xordev->clk);
+		clk_put(xordev->clk);
+	}
+
 	return ret;
 }