From 47ea307f04ae98f636e69e9f7432337e5235c88a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 4 Nov 2007 13:14:15 -0800 Subject: [PATCH] --- yaml --- r: 73109 b: refs/heads/master c: 5da0c7aad6271dd29526e3b49cbeb3bab9e8e491 h: refs/heads/master i: 73107: 52b21dced3697b2212b83b4b4a818d4210d6ffc0 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 293cc3cb5161..b2966c6a69b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e66269d40229cd9823024120910a43af57a9d72 +refs/heads/master: 5da0c7aad6271dd29526e3b49cbeb3bab9e8e491 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;