Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772', 'bugzilla...

[safe/jmp/linux-2.6] / drivers / misc / thinkpad_acpi.c

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index d29ad2e..3f28f6e 100644 (file)
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -6191,7 +6191,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;
        }