[PATCH] thinkpad-acpi: recognize Lenovo as version string in newer V-series BIOS

manoj.iyer at canonical.com manoj.iyer at canonical.com
Tue May 22 15:06:27 UTC 2012


From: Manoj Iyer <manoj.iyer at canonical.com>

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 at canonical.com>
Signed-off-by: Matthew Garrett <mjg at redhat.com>
Tested-by: James Ferguson <james.ferguson at canonical.com>
Tested-by: Dennis Chua <dennis.chua at canonical.com>
Tested-by: Ike Pan <ike.pan at canonical.com>
Acked-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
(cherry picked from commit 23b0531641c72c6a2f410af1c593293fa353884b)

Signed-off-by: Manoj Iyer <manoj.iyer at canonical.com>

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;
-- 
1.7.9.5





More information about the kernel-team mailing list