Commit 615bb29c authored Nov 03, 2007 by Mark Lord Committed by Linus Torvalds Nov 04, 2007

rtc: ignore msb when reading back mday from alarm



I have a system here that actively relies upon RTC wake alarms, and it
has been failing (again) for a few days when attempting to use the
/sys/class/rtc/rtc?/wakealarm interface.

The old (fixed by Linus) /proc/ interface still works, but I'd like to
get it using the new one.

This patch fixes rtc-cmos to ignore the two upper bits when reading the
BCD mday (day of month) register from CMOS.  Some systems (eg.  mine)
seem to have the top bit set to "1" for some reason.

The older /proc/ interface ignores the upper bits, and so we should too.

Signed-off-by: Mark Lord <mlord@pobox.com>
Acked-by: David Brownell <david-b@pacbell.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent b4f55508

drivers/rtc/rtc-cmos.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,8 @@ static int cmos_read_alarm(struct device dev, struct rtc_wkalrm t)
		t->time.tm_hour = CMOS_READ(RTC_HOURS_ALARM);

		if (cmos->day_alrm) {
		t->time.tm_mday = CMOS_READ(cmos->day_alrm);
		/* ignore upper bits on readback per ACPI spec */
		t->time.tm_mday = CMOS_READ(cmos->day_alrm) & 0x3f;
		if (!t->time.tm_mday)
		t->time.tm_mday = -1;

Admin message