commit 68bcb7330fd88839da47f722cf8d7781afd5fd01
author Linux Build Service Account <lnxbuild@localhost> Tue Mar 18 05:42:06 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Mar 18 05:41:59 2014 -0700
tree a93235f9c9c5bedecad490bdf22512c0b5a94e44
parent 1cbd8330733eb7c7c3a5313cf52bfb4418f3ecc3
parent ed763b33b147a112d0a624a88b1c05e65f497878

Merge "msm: mpm-of: set wakeup interrupt as NO_SUSPEND"

arch/arm/mach-msm/mpm-of.c

diff --git a/arch/arm/mach-msm/mpm-of.c b/arch/arm/mach-msm/mpm-of.c
index 1fbd077..dc3af3e 100644
--- a/arch/arm/mach-msm/mpm-of.c
+++ b/arch/arm/mach-msm/mpm-of.c
@@ -678,7 +678,8 @@
 		return -ENXIO;
 	}
 	ret = devm_request_irq(&pdev->dev, dev->mpm_ipc_irq, msm_mpm_irq,
-			IRQF_TRIGGER_RISING, pdev->name, msm_mpm_irq);
+			IRQF_TRIGGER_RISING | IRQF_NO_SUSPEND, pdev->name,
+			msm_mpm_irq);
 
 	if (ret) {
 		pr_info("%s(): request_irq failed errno: %d\n", __func__, ret);