aboutsummaryrefslogtreecommitdiff
path: root/drivers/platform/x86/thinkpad_acpi.c
diff options
context:
space:
mode:
authorManoj Iyer <manoj.iyer@canonical.com>2012-03-09 17:32:24 -0600
committerMatthew Garrett <mjg@redhat.com>2012-03-26 15:05:52 -0400
commit23b0531641c72c6a2f410af1c593293fa353884b (patch)
treea0c342b042b98c8b0c0dc6af5135d2f1ed999316 /drivers/platform/x86/thinkpad_acpi.c
parentade28abdcb474531bb7045c032a286812c7f6d2a (diff)
downloadlinux-linaro-stable-23b0531641c72c6a2f410af1c593293fa353884b.tar.gz
thinkpad-acpi: recognize Lenovo as version string in newer V-series BIOS
The newer V series bios reports product version as 'Lenovo' instead of 'ThinkPad'. Recoginze this new string so that the module can load. Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> Signed-off-by: Matthew Garrett <mjg@redhat.com> Tested-by: James Ferguson <james.ferguson@canonical.com> Tested-by: Dennis Chua <dennis.chua@canonical.com> Tested-by: Ike Pan <ike.pan@canonical.com> Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Diffstat (limited to 'drivers/platform/x86/thinkpad_acpi.c')
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index ea0c6075b720..d68c0002f4a2 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/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;