From 1ded5f99884a8e5aeae2d9a5e2c43951dabb12c4 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 22 Sep 2011 11:41:07 +0100
Subject: [PATCH] --- yaml --- r: 269439 b: refs/heads/master c:
 72ae00c970cf1e6027c5b719f42e7eff0aa1c1d9 h: refs/heads/master i:   269437:
 5f0b889c6dad3cc95ab08d21e6ed9db510c459c7   269435:
 8c6b78d123f9dded4c5eef8625629a350fce2447   269431:
 776298f47973a0058da7bca4dcc19ee88d3fc16d   269423:
 588e1f576cc97b253f1d98df54edf51372529761   269407:
 1e8d79fc00fa454b99b52b7b47b0b6e38372ed9c   269375:
 1f9a88c2205abe1fd9379c2011fcedfdd41a20d0   269311:
 e1964efc94899ca54773dd387d16c51ecbfe08f4 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/common/sa1111.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4fa0ed71ef62..3a64db762588 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52ca0f3ab568497adeac217e4167b51d9b4d4884
+refs/heads/master: 72ae00c970cf1e6027c5b719f42e7eff0aa1c1d9
diff --git a/trunk/arch/arm/common/sa1111.c b/trunk/arch/arm/common/sa1111.c
index 0569de6acfba..61691cdbdcf2 100644
--- a/trunk/arch/arm/common/sa1111.c
+++ b/trunk/arch/arm/common/sa1111.c
@@ -718,6 +718,10 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
 		goto err_free;
 	}
 
+	ret = clk_prepare(sachip->clk);
+	if (ret)
+		goto err_clkput;
+
 	spin_lock_init(&sachip->lock);
 
 	sachip->dev = me;
@@ -733,7 +737,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
 	sachip->base = ioremap(mem->start, PAGE_SIZE * 2);
 	if (!sachip->base) {
 		ret = -ENOMEM;
-		goto err_clkput;
+		goto err_clk_unprep;
 	}
 
 	/*
@@ -809,6 +813,8 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
 
  err_unmap:
 	iounmap(sachip->base);
+ err_clk_unprep:
+	clk_unprepare(sachip->clk);
  err_clkput:
 	clk_put(sachip->clk);
  err_free:
@@ -835,6 +841,7 @@ static void __sa1111_remove(struct sa1111 *sachip)
 	sa1111_writel(0, irqbase + SA1111_WAKEEN1);
 
 	clk_disable(sachip->clk);
+	clk_unprepare(sachip->clk);
 
 	if (sachip->irq != NO_IRQ) {
 		irq_set_chained_handler(sachip->irq, NULL);