commit 79c65b5b5af46a8e0d728807bddb7eec4e5aef47
author Linux Build Service Account <lnxbuild@localhost> Mon Jul 23 01:33:38 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Mon Jul 23 01:33:38 2012 -0700
tree fb01f14942aa9e54f63741861f87cfb5ef669aa9
parent 97acc8e05d4a0d79070ceeef2568a82982f4d250
parent 51676a19760897c1d3fe35dde50738827d25598c

Merge "msm: smsm: Use interrupt mask for local SMSM notifications" into msm-3.4

arch/arm/mach-msm/smd.c

diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c
index 54512ab..948dbbb 100644
--- a/arch/arm/mach-msm/smd.c
+++ b/arch/arm/mach-msm/smd.c
@@ -559,7 +559,11 @@
 	 * on DEM-based targets.  Grabbing a wakelock in this case will
 	 * abort the power-down sequencing.
 	 */
-	smsm_cb_snapshot(0);
+	if (smsm_info.intr_mask &&
+	    (__raw_readl(SMSM_INTR_MASK_ADDR(smsm_entry, SMSM_APPS))
+				& notify_mask)) {
+		smsm_cb_snapshot(0);
+	}
 }
 
 void smd_diag(void)