On Mon, Jul 22, 2013 at 02:00:42PM -0700, John Stultz wrote:Also, just to clarify, on the affected machines, with this patch,See below.
wake-up alarm's will in effect be disabled, right?
You're right - the first version did call it only in rtc_alarm_disable()@@ -385,6 +418,9 @@ static int cmos_alarm_irq_enable(struct device *dev, unsigned int enabled)Did you want this in cmos_alarm_irq_enable? Or cmos_irq_disable?
if (!is_valid_irq(cmos->irq))
return -EINVAL;
+ if (!disable_alarm)
+ return 0;
+
so I should move it to cmos_alarm_disable(). Will fix.
Btw, I did some more runs on the weekend. It seems, the setting of the
alarm interrupt bit in RTC_CONTROL doesn't matter. I dumped its contents
on shutdown and I had cases where it was 0x22 (bit 5 set) and 0x2.
So my hunch currently is us *not* disabling the alarm, doesn't make itJust to avoid the double negatives, you're saying:
reboot the box.