Messages in this thread Patch in this message | | | Date | Mon, 22 Dec 2014 14:59:49 +0000 | From | Matthew Garrett <> | Subject | Re: System automatically wakes up because of Intel Rapid Start Technology |
| |
Can you try this diff?
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 5b2e761..637f980 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -48,6 +48,7 @@ struct cmos_rtc { struct device *dev; int irq; struct resource *iomem; + struct rtc_wkalrm alm; void (*wake_on)(struct device *); void (*wake_off)(struct device *); @@ -59,6 +60,8 @@ struct cmos_rtc { u8 day_alrm; u8 mon_alrm; u8 century; + + bool valid_alarm; }; /* both platform and pnp busses use negative numbers for invalid irqs */ @@ -879,6 +882,7 @@ static int cmos_suspend(struct device *dev) cmos_checkintr(cmos, tmp); } + cmos->valid_alarm = !!cmos_read_alarm(dev, &cmos->alm); spin_unlock_irq(&rtc_lock); if (tmp & RTC_AIE) { @@ -949,6 +953,10 @@ static int cmos_resume(struct device *dev) hpet_mask_rtc_irq_bit(RTC_AIE); } while (mask & RTC_AIE); } + + if (cmos->valid_alarm) + cmos_set_alarm(dev, &cmos->alm); + spin_unlock_irq(&rtc_lock); dev_dbg(dev, "resume, ctrl %02x\n", tmp);
-- Matthew Garrett | mjg59@srcf.ucam.org
| |