commit d6ac8940d66f2c69f467ab7630bdc79d5bebcf69
author Linux Build Service Account <lnxbuild@localhost> Mon Jun 25 16:12:33 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Mon Jun 25 16:12:33 2012 -0700
tree ad6594e075069f984c8108bd8c41bc553880b24b
parent 46ae789aed06e1b33418ba6f1739977a34874f58
parent 215de5dcbdc3e5ee3504bbdfe5c577ce66a2851f

Merge "msm: clock-rpm: Fix branch clocks so that they can be enabled" into msm-3.4

arch/arm/mach-msm/clock-rpm.c

diff --git a/arch/arm/mach-msm/clock-rpm.c b/arch/arm/mach-msm/clock-rpm.c
index ab57cf8..2ec40ce 100644
--- a/arch/arm/mach-msm/clock-rpm.c
+++ b/arch/arm/mach-msm/clock-rpm.c
@@ -272,9 +272,11 @@
 	if (rc < 0)
 		return HANDOFF_DISABLED_CLK;
 
-	r->last_set_khz = iv.value;
-	r->last_set_sleep_khz = iv.value;
-	clk->rate = iv.value * 1000;
+	if (!r->branch) {
+		r->last_set_khz = iv.value;
+		r->last_set_sleep_khz = iv.value;
+		clk->rate = iv.value * 1000;
+	}
 
 	return HANDOFF_ENABLED_CLK;
 }