thinkpad-acpi: recognize Lenovo as version string in newer V-series BIOS
authorManoj Iyer <manoj.iyer@canonical.com>
Fri, 9 Mar 2012 23:32:24 +0000 (17:32 -0600)
committerMatthew Garrett <mjg@redhat.com>
Mon, 26 Mar 2012 19:05:52 +0000 (15:05 -0400)
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>
drivers/platform/x86/thinkpad_acpi.c

index ea0c6075b72012458f099bfd6fb013415e7d85e1..d68c0002f4a29c451116422b4693ab2e330f7160 100644 (file)
@@ -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;