From 353a72e4fc13a219dfac9d406c3836947265eb15 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Fri, 18 Apr 2008 13:27:29 -0700
Subject: [PATCH] --- yaml --- r: 95507 b: refs/heads/master c:
 90fe17f4df2f830601ffd422b11d1f7f9a9d0355 h: refs/heads/master i:   95505:
 b79b6c0d146049dfb74e25a8cd18389b8c1d5142   95503:
 c991e35b45632fe10b45c54007114ea165c88956 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/misc/thinkpad_acpi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e0fbcf9e1d3e..c62b20516419 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a815ab8b5891f3d2515316655729272f68269e3b
+refs/heads/master: 90fe17f4df2f830601ffd422b11d1f7f9a9d0355
diff --git a/trunk/drivers/misc/thinkpad_acpi.c b/trunk/drivers/misc/thinkpad_acpi.c
index 6cb781262f94..31115c9cfb34 100644
--- a/trunk/drivers/misc/thinkpad_acpi.c
+++ b/trunk/drivers/misc/thinkpad_acpi.c
@@ -5826,7 +5826,7 @@ static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp)
 
 	tp->model_str = kstrdup(dmi_get_system_info(DMI_PRODUCT_VERSION),
 					GFP_KERNEL);
-	if (strnicmp(tp->model_str, "ThinkPad", 8) != 0) {
+	if (tp->model_str && strnicmp(tp->model_str, "ThinkPad", 8) != 0) {
 		kfree(tp->model_str);
 		tp->model_str = NULL;
 	}