From a90f0b065cb258e1402f1cf5d5fa2d146737bc4d Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Sun, 16 Aug 2009 21:01:22 +0900
Subject: [PATCH] --- yaml --- r: 158513 b: refs/heads/master c:
 02c24fa87724bb3af969463cd74dc3b3feb24740 h: refs/heads/master i:   158511:
 093d66ac5d0fc8d22d3abfa23dbe235bb5ed9517 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/firmware/dmi_scan.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4d3cb519a252..88e10b4a46ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd30add88cea831dfb854d564478f09ee66206b5
+refs/heads/master: 02c24fa87724bb3af969463cd74dc3b3feb24740
diff --git a/trunk/drivers/firmware/dmi_scan.c b/trunk/drivers/firmware/dmi_scan.c
index 24c84ae81527..531e621677ce 100644
--- a/trunk/drivers/firmware/dmi_scan.c
+++ b/trunk/drivers/firmware/dmi_scan.c
@@ -577,6 +577,7 @@ int dmi_get_year(int field)
 {
 	int year;
 	const char *s = dmi_get_system_info(field);
+	char *e;
 
 	if (!s)
 		return -1;
@@ -587,8 +588,8 @@ int dmi_get_year(int field)
 		return 0;
 
 	s += 1;
-	year = simple_strtoul(s, NULL, 0);
-	if (year && year < 100) {	/* 2-digit year */
+	year = simple_strtoul(s, &e, 10);
+	if (s != e && year < 100) {	/* 2-digit year */
 		year += 1900;
 		if (year < 1996)	/* no dates < spec 1.0 */
 			year += 100;