projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'fixes-for-v4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
rtc
/
rtc-at91rm9200.c
diff --git
a/drivers/rtc/rtc-at91rm9200.c
b/drivers/rtc/rtc-at91rm9200.c
index cb62e214b52a0066f0a0402c7d89d8b0de74b4fb..b60fd477778f7fed1e8c1a510d80646f47d8373f 100644
(file)
--- a/
drivers/rtc/rtc-at91rm9200.c
+++ b/
drivers/rtc/rtc-at91rm9200.c
@@
-495,6
+495,8
@@
static int at91_rtc_suspend(struct device *dev)
/* this IRQ is shared with DBGU and other hardware which isn't
* necessarily doing PM like we are...
*/
+ at91_rtc_write(AT91_RTC_SCCR, AT91_RTC_ALARM);
+
at91_rtc_imr = at91_rtc_read_imr()
& (AT91_RTC_ALARM|AT91_RTC_SECEV);
if (at91_rtc_imr) {