git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[IA64] Itanium MC Error Injection Tool: Makefile changes
[pandora-kernel.git]
/
drivers
/
rtc
/
rtc-omap.c
diff --git
a/drivers/rtc/rtc-omap.c
b/drivers/rtc/rtc-omap.c
index
eac5fb1
..
d59880d
100644
(file)
--- a/
drivers/rtc/rtc-omap.c
+++ b/
drivers/rtc/rtc-omap.c
@@
-279,9
+279,8
@@
static int omap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
local_irq_enable();
bcd2tm(&alm->time);
- alm->
pending
= !!(rtc_read(OMAP_RTC_INTERRUPTS_REG)
+ alm->
enabled
= !!(rtc_read(OMAP_RTC_INTERRUPTS_REG)
& OMAP_RTC_INTERRUPTS_IT_ALARM);
- alm->enabled = alm->pending && device_may_wakeup(dev);
return 0;
}