---

yaml --- r: 332876 b: refs/heads/master c: faf6fbc h: refs/heads/master v: v3
git-mirror · Sep 18, 2012 · 1d42d97 · 1d42d97
1 parent e28745a
commit 1d42d97
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 921eeadbbdd7ffba16937a3b63e408c980c39db6
+refs/heads/master: faf6fbc6f2ca3b34bf464a8bb079a998e571957c
diff --git a/trunk/drivers/dma/pl330.c b/trunk/drivers/dma/pl330.c
@@ -2896,11 +2896,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
 
 	amba_set_drvdata(adev, pdmac);
 
-#ifndef CONFIG_PM_RUNTIME
-	/* enable dma clk */
-	clk_enable(pdmac->clk);
-#endif
-
 	irq = adev->irq[0];
 	ret = request_irq(irq, pl330_irq_handler, 0,
 			dev_name(&adev->dev), pi);
@@ -2988,9 +2983,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
 probe_err4:
 	free_irq(irq, pi);
 probe_err3:
-#ifndef CONFIG_PM_RUNTIME
-	clk_disable(pdmac->clk);
-#endif
 	clk_put(pdmac->clk);
 probe_err2:
 	iounmap(pi->base);
@@ -3038,10 +3030,6 @@ static int __devexit pl330_remove(struct amba_device *adev)
 	res = &adev->res;
 	release_mem_region(res->start, resource_size(res));
 
-#ifndef CONFIG_PM_RUNTIME
-	clk_disable(pdmac->clk);
-#endif
-
 	kfree(pdmac);
 
 	return 0;