commit a402b2a10facdfa330180720ac0221144756e607
author Linux Build Service Account <lnxbuild@localhost> Wed Sep 19 08:54:12 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 19 08:54:08 2012 -0700
tree ab9d8c32e0dd1b4f54f0cc13e8202a640ec68a3b
parent 11e4dec6fd2b55b779467763c68fdefc72f3428f
parent b6b3998a08d8f6a1f54a612a1f6e6fca9b0f27f5

Merge "msm: acpuclock-7627: Avoid AXI freq. change while going into power collapse"

arch/arm/mach-msm/acpuclock-7627.c

diff --git a/arch/arm/mach-msm/acpuclock-7627.c b/arch/arm/mach-msm/acpuclock-7627.c
index 7be3667..5181761 100644
--- a/arch/arm/mach-msm/acpuclock-7627.c
+++ b/arch/arm/mach-msm/acpuclock-7627.c
@@ -827,7 +827,8 @@
 		goto out;
 
 	/* Change the AXI bus frequency if we can. */
-	if (strt_s->axiclk_khz != tgt_s->axiclk_khz) {
+	if (reason != SETRATE_PC &&
+		strt_s->axiclk_khz != tgt_s->axiclk_khz) {
 		res = clk_set_rate(drv_state.ebi1_clk,
 				tgt_s->axiclk_khz * 1000);
 		if (res < 0)