Author: titmuss
Date: Wed Jan 30 02:23:29 2008
New Revision: 1694
URL: http://svn.slimdevices.com?rev=1694&root=Jive&view=rev
Log:
Bug: 6580
Description:
Patch suggested by Ben Dooks for the RTC.
Modified:
branches/7.0/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/rtc/rtc-s3c.c
Modified:
branches/7.0/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/rtc/rtc-s3c.c
URL:
http://svn.slimdevices.com/branches/7.0/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/rtc/rtc-s3c.c?rev=1694&root=Jive&r1=1693&r2=1694&view=diff
==============================================================================
---
branches/7.0/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/rtc/rtc-s3c.c
(original)
+++
branches/7.0/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/rtc/rtc-s3c.c
Wed Jan 30 02:23:29 2008
@@ -276,24 +276,23 @@
writeb(BIN2BCD(tm->tm_mon + 1), base + S3C2410_ALMMON);
}
- if (tm->tm_year >= 0 && tm->tm_year < 0xffff) {
+ if (tm->tm_year >= 100 && tm->tm_year < 200) {
alrm_en |= S3C2410_RTCALM_YEAREN;
writeb(BIN2BCD(tm->tm_year - 100), base + S3C2410_ALMYEAR);
}
- if (alrm->enabled)
+ if (alrm->enabled) {
alrm_en |= S3C2410_RTCALM_ALMEN;
- else
+ enable_irq_wake(s3c_rtc_alarmno);
+ }
+ else {
alrm_en &= ~S3C2410_RTCALM_ALMEN;
+ disable_irq_wake(s3c_rtc_alarmno);
+ }
pr_debug("setting S3C2410_RTCALM to %08x\n", alrm_en);
writeb(alrm_en, base + S3C2410_RTCALM);
-
- if (alrm->enabled)
- enable_irq_wake(s3c_rtc_alarmno);
- else
- disable_irq_wake(s3c_rtc_alarmno);
return 0;
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
