From 682b8ab67e21231e5d4042b64c0651cfb371b54a Mon Sep 17 00:00:00 2001 From: Manoj Iyer Date: Fri, 9 Mar 2012 17:32:24 -0600 Subject: [PATCH] --- yaml --- r: 297020 b: refs/heads/master c: 23b0531641c72c6a2f410af1c593293fa353884b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/thinkpad_acpi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e724505ae181..ce6cd3ea6715 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ade28abdcb474531bb7045c032a286812c7f6d2a +refs/heads/master: 23b0531641c72c6a2f410af1c593293fa353884b diff --git a/trunk/drivers/platform/x86/thinkpad_acpi.c b/trunk/drivers/platform/x86/thinkpad_acpi.c index ea0c6075b720..d68c0002f4a2 100644 --- a/trunk/drivers/platform/x86/thinkpad_acpi.c +++ b/trunk/drivers/platform/x86/thinkpad_acpi.c @@ -8658,7 +8658,7 @@ static int __must_check __init get_thinkpad_model_data( } s = dmi_get_system_info(DMI_PRODUCT_VERSION); - if (s && !strnicmp(s, "ThinkPad", 8)) { + if (s && !(strnicmp(s, "ThinkPad", 8) && strnicmp(s, "Lenovo", 6))) { tp->model_str = kstrdup(s, GFP_KERNEL); if (!tp->model_str) return -ENOMEM;