summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRobert Marklund <robert.marklund@stericsson.com>2012-01-10 15:10:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 16:30:52 -0800
commit10d065e65b0be33e868f9c6da67026b5111480d8 (patch)
tree8cd847ee24e44791c9d214af5ad6772072872c5f /drivers
parentc92182ee0b5a33c74e4b6c0ded36166e4ef3bc3e (diff)
downloadlinux-3.10-10d065e65b0be33e868f9c6da67026b5111480d8.tar.gz
linux-3.10-10d065e65b0be33e868f9c6da67026b5111480d8.tar.bz2
linux-3.10-10d065e65b0be33e868f9c6da67026b5111480d8.zip
rtc/ab8500: don't disable IRQ:s when suspending
We want this driver to be able to wake up the system. Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/rtc/rtc-ab8500.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c
index e346705aae9..d6bfc4f3658 100644
--- a/drivers/rtc/rtc-ab8500.c
+++ b/drivers/rtc/rtc-ab8500.c
@@ -316,8 +316,8 @@ static int __devinit ab8500_rtc_probe(struct platform_device *pdev)
return err;
}
- err = request_threaded_irq(irq, NULL, rtc_alarm_handler, 0,
- "ab8500-rtc", rtc);
+ err = request_threaded_irq(irq, NULL, rtc_alarm_handler,
+ IRQF_NO_SUSPEND, "ab8500-rtc", rtc);
if (err < 0) {
rtc_device_unregister(rtc);
return err;