From patchwork Tue May 22 15:06:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: thinkpad-acpi: recognize Lenovo as version string in newer V-series BIOS Date: Tue, 22 May 2012 05:06:27 -0000 From: Manoj Iyer X-Patchwork-Id: 160657 Message-Id: <1337699187-5500-1-git-send-email-manoj.iyer@canonical.com> To: kernel-team@lists.ubuntu.com From: Manoj Iyer 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 Signed-off-by: Matthew Garrett Tested-by: James Ferguson Tested-by: Dennis Chua Tested-by: Ike Pan Acked-by: Henrique de Moraes Holschuh (cherry picked from commit 23b0531641c72c6a2f410af1c593293fa353884b) Signed-off-by: Manoj Iyer BugLink: http://launchpad.net/bugs/1002920 --- drivers/platform/x86/thinkpad_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 7b82868..cc6b1c4 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -8661,7 +8661,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;