commit 820686f69ada7f6bad99cff7ca869cbb369a9668
author Linux Build Service Account <lnxbuild@localhost> Fri Feb 21 21:00:52 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Feb 21 21:00:52 2014 -0800
tree 615d280f91a03cd46fe8c709b0eb3cbac19973ab
parent da8e4fb063c201bfb7c30ea846aa4d38de925833
parent adfeebe144713c457f0a3d0974408170466f2ada

Merge "msm: pm: bug in pc debug counters logic"

arch/arm/mach-msm/msm-pm.c

diff --git a/arch/arm/mach-msm/msm-pm.c b/arch/arm/mach-msm/msm-pm.c
index 865cd0a..0cfb47a 100644
--- a/arch/arm/mach-msm/msm-pm.c
+++ b/arch/arm/mach-msm/msm-pm.c
@@ -452,8 +452,8 @@
 	if (!msm_pc_debug_counters)
 		return;
 
-	cnt = readl_relaxed(msm_pc_debug_counters + cpu * 4 + offset * 4);
-	writel_relaxed(++cnt, msm_pc_debug_counters + cpu * 4 + offset * 4);
+	cnt = readl_relaxed(msm_pc_debug_counters + cpu * 4 * MSM_PC_NUM_COUNTERS + offset * 4);
+	writel_relaxed(++cnt, msm_pc_debug_counters + cpu * 4 * MSM_PC_NUM_COUNTERS + offset * 4);
 	mb();
 }