Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index f3ee2ad566b4..dcdc142a3441 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -198,9 +198,8 @@ static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t)
 
         /* Writing 0xff means "don't care" or "match all".  */
 
-        mon = t->time.tm_mon;
-        mon = (mon < 12) ? BIN2BCD(mon) : 0xff;
-        mon++;
+        mon = t->time.tm_mon + 1;
+        mon = (mon <= 12) ? BIN2BCD(mon) : 0xff;
 
         mday = t->time.tm_mday;
         mday = (mday >= 1 && mday <= 31) ? BIN2BCD(mday) : 0xff;
@@ -943,6 +942,9 @@ static void cmos_platform_shutdown(struct platform_device *pdev)
         cmos_do_shutdown();
 }
 
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:rtc_cmos");
+
 static struct platform_driver cmos_platform_driver = {
         .remove         = __exit_p(cmos_platform_remove),
         .shutdown       = cmos_platform_shutdown,