summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMattias Wallin <mattias.wallin@stericsson.com>2010-12-02 15:10:27 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2011-01-14 12:37:47 +0100
commit4f079985b2caacfda5103dd85fb028a2848c84ab (patch)
tree5c07404e652f71731dd9745d178ecd25de03754a /drivers/mfd
parentmfd: Export ab8500 chip id to sysfs (diff)
downloadlinux-4f079985b2caacfda5103dd85fb028a2848c84ab.tar.xz
linux-4f079985b2caacfda5103dd85fb028a2848c84ab.zip
mfd: ab8500-core wake up from suspend
This patch makes the system wake up from suspend when an ab8500 interrupt occur. This can for example be USB cable insert or an RTC alarm. Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/ab8500-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 2bd4437cf331..e464e94c4bc0 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -519,7 +519,8 @@ int __devinit ab8500_init(struct ab8500 *ab8500)
return ret;
ret = request_threaded_irq(ab8500->irq, NULL, ab8500_irq,
- IRQF_ONESHOT, "ab8500", ab8500);
+ IRQF_ONESHOT | IRQF_NO_SUSPEND,
+ "ab8500", ab8500);
if (ret)
goto out_removeirq;
}