commit 46bf141b73b4af4d5c3d67e09e77785b3d024c9b
author Linux Build Service Account <lnxbuild@localhost> Sat Jul 28 17:01:29 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Sat Jul 28 17:01:29 2012 -0700
tree a8da2ca316fb1c3518b4714ed6c714ec53580b81
parent 9b2e974535601acbd5a93b9248536a7ca6bdb5e4
parent 62360c655bad5d5988344c01ddd68f0db104dc9a

Merge "msm: mpm: Configure MPM interrupt as wakeup" into msm-3.4

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 cc60596..f98c0f2 100644
--- a/arch/arm/mach-msm/mpm-of.c
+++ b/arch/arm/mach-msm/mpm-of.c
@@ -554,6 +554,14 @@
 		pr_info("%s(): request_irq failed errno: %d\n", __func__, ret);
 		goto failed_irq_get;
 	}
+	ret = irq_set_irq_wake(dev->mpm_ipc_irq, 1);
+
+	if (ret) {
+		pr_err("%s: failed to set wakeup irq %u: %d\n",
+			__func__, dev->mpm_ipc_irq, ret);
+		goto failed_irq_get;
+
+	}
 	msm_mpm_initialized |= MSM_MPM_DEVICE_PROBED;
 
 	return 0;