From patchwork Tue May 22 15:06:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manoj Iyer X-Patchwork-Id: 160657 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 1EC26B6EF3 for ; Wed, 23 May 2012 01:06:42 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SWqfR-00045j-Eu; Tue, 22 May 2012 15:06:33 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SWqfP-00045c-25 for kernel-team@lists.ubuntu.com; Tue, 22 May 2012 15:06:31 +0000 Received: from 108-226-168-165.lightspeed.austtx.sbcglobal.net ([108.226.168.165] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SWqfO-0005Qa-Df for kernel-team@lists.ubuntu.com; Tue, 22 May 2012 15:06:31 +0000 From: manoj.iyer@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH] thinkpad-acpi: recognize Lenovo as version string in newer V-series BIOS Date: Tue, 22 May 2012 10:06:27 -0500 Message-Id: <1337699187-5500-1-git-send-email-manoj.iyer@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@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;