---

yaml
---
r: 269439
b: refs/heads/master
c: 72ae00c
h: refs/heads/master
i:
  269437: 5f0b889
  269435: 8c6b78d
  269431: 776298f
  269423: 588e1f5
  269407: 1e8d79f
  269375: 1f9a88c
  269311: e1964ef
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52ca0f3ab568497adeac217e4167b51d9b4d4884
+refs/heads/master: 72ae00c970cf1e6027c5b719f42e7eff0aa1c1d9

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);