From 52b21dced3697b2212b83b4b4a818d4210d6ffc0 Mon Sep 17 00:00:00 2001 From: Mark Lord Date: Sat, 3 Nov 2007 22:04:03 -0400 Subject: [PATCH] --- yaml --- r: 73107 b: refs/heads/master c: 615bb29ccbe9fa06d9f33b29d9c3f51340726656 h: refs/heads/master i: 73105: df5531b5bad67a8bff136ddff0335bd60f093712 73103: b01efec403768e5dedaeaf4921a8aca486fc3ef0 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-cmos.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8a9fb1660df3..12f419ea3c9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4f555081fdd27d13e6ff39d455d5aefae9d2c0c +refs/heads/master: 615bb29ccbe9fa06d9f33b29d9c3f51340726656 diff --git a/trunk/drivers/rtc/rtc-cmos.c b/trunk/drivers/rtc/rtc-cmos.c index e3fe83a23cf7..29cf1457ca10 100644 --- a/trunk/drivers/rtc/rtc-cmos.c +++ b/trunk/drivers/rtc/rtc-cmos.c @@ -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;