commit a54734678ff9cb97938b9f7648547174f3b118e4
author Linux Build Service Account <lnxbuild@localhost> Thu Mar 29 22:23:31 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Thu Mar 29 22:23:31 2012 -0700
tree 45d937048599eae38821dbd3e07ee0982619dbe2
parent 0664b9877f2f6867585c108988ff70e647ac2acd
parent 1236375b068e98bd1c2ec4f349b65ade61f7bd26

Merge "msm: scm-pas: Migrate to clk_prepare/unprepare() APIs" into msm-3.0

arch/arm/mach-msm/scm-pas.c

diff --git a/arch/arm/mach-msm/scm-pas.c b/arch/arm/mach-msm/scm-pas.c
index e0d0dd8..4096d9c 100644
--- a/arch/arm/mach-msm/scm-pas.c
+++ b/arch/arm/mach-msm/scm-pas.c
@@ -103,7 +103,7 @@
 		if (ret) {
 			pr_err("bandwidth request failed (%d)\n", ret);
 		} else {
-			ret = clk_enable(scm_bus_clk);
+			ret = clk_prepare_enable(scm_bus_clk);
 			if (ret)
 				pr_err("clock enable failed\n");
 		}
@@ -121,7 +121,7 @@
 	mutex_lock(&scm_pas_bw_mutex);
 	if (scm_pas_bw_count-- == 1) {
 		msm_bus_scale_client_update_request(scm_perf_client, 0);
-		clk_disable(scm_bus_clk);
+		clk_disable_unprepare(scm_bus_clk);
 	}
 	mutex_unlock(&scm_pas_bw_mutex);
 }