From 10b9d8bd6a83c5d6a6eac79ef8bb4ae74a90c7cf Mon Sep 17 00:00:00 2001
From: Yi Yang <yi.y.yang@intel.com>
Date: Thu, 27 Dec 2007 22:04:26 -0500
Subject: [PATCH] --- yaml --- r: 84108 b: refs/heads/master c:
 087980295082ccaa816330bc69c29a2ff53a244c h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/acpi/sleep/proc.c | 46 +++++++--------------------------
 2 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/[refs] b/[refs]
index fe3d41fa3430..4aadc6640855 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 975c30257e75c3d067d4858f60963b80fc6bd0e4
+refs/heads/master: 087980295082ccaa816330bc69c29a2ff53a244c
diff --git a/trunk/drivers/acpi/sleep/proc.c b/trunk/drivers/acpi/sleep/proc.c
index fce78fbf5f64..e19eb0c25e62 100644
--- a/trunk/drivers/acpi/sleep/proc.c
+++ b/trunk/drivers/acpi/sleep/proc.c
@@ -178,9 +178,6 @@ static int get_date_field(char **p, u32 * value)
 	 * Try to find delimeter, only to insert null.  The end of the
 	 * string won't have one, but is still valid.
 	 */
-	if (*p == NULL)
-		return result;
-
 	next = strpbrk(*p, "- :");
 	if (next)
 		*next++ = '\0';
@@ -193,8 +190,6 @@ static int get_date_field(char **p, u32 * value)
 
 	if (next)
 		*p = next;
-	else
-		*p = NULL;
 
 	return result;
 }
@@ -256,27 +251,6 @@ acpi_system_write_alarm(struct file *file,
 	if ((result = get_date_field(&p, &sec)))
 		goto end;
 
-	if (sec > 59) {
-		min += 1;
-		sec -= 60;
-	}
-	if (min > 59) {
-		hr += 1;
-		min -= 60;
-	}
-	if (hr > 23) {
-		day += 1;
-		hr -= 24;
-	}
-	if (day > 31) {
-		mo += 1;
-		day -= 31;
-	}
-	if (mo > 12) {
-		yr += 1;
-		mo -= 12;
-	}
-
 	spin_lock_irq(&rtc_lock);
 
 	rtc_control = CMOS_READ(RTC_CONTROL);
@@ -293,24 +267,24 @@ acpi_system_write_alarm(struct file *file,
 	spin_unlock_irq(&rtc_lock);
 
 	if (sec > 59) {
-		min++;
-		sec -= 60;
+		min += sec/60;
+		sec = sec%60;
 	}
 	if (min > 59) {
-		hr++;
-		min -= 60;
+		hr += min/60;
+		min = min%60;
 	}
 	if (hr > 23) {
-		day++;
-		hr -= 24;
+		day += hr/24;
+		hr = hr%24;
 	}
 	if (day > 31) {
-		mo++;
-		day -= 31;
+		mo += day/32;
+		day = day%32;
 	}
 	if (mo > 12) {
-		yr++;
-		mo -= 12;
+		yr += mo/13;
+		mo = mo%13;
 	}
 
 	spin_lock_irq(&rtc_lock);