Patchwork thinkpad-acpi: recognize Lenovo as version string in newer V-series BIOS

login
register
mail settings
Submitter Manoj Iyer
Date May 22, 2012, 3:06 p.m.
Message ID <1337699187-5500-1-git-send-email-manoj.iyer@canonical.com>
Download mbox | patch
Permalink /patch/160657/
State New
Headers show

Comments

Manoj Iyer - May 22, 2012, 3:06 p.m.
From: Manoj Iyer <manoj.iyer@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@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>
(cherry picked from commit 23b0531641c72c6a2f410af1c593293fa353884b)

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

BugLink: http://launchpad.net/bugs/1002920
---
 drivers/platform/x86/thinkpad_acpi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Tim Gardner - May 22, 2012, 4:45 p.m.
I am assuming this SRU is for Precise ?
Seth Forshee - May 22, 2012, 4:54 p.m.
On Tue, May 22, 2012 at 10:06:27AM -0500, manoj.iyer@canonical.com wrote:
> From: Manoj Iyer <manoj.iyer@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@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>
> (cherry picked from commit 23b0531641c72c6a2f410af1c593293fa353884b)
> 
> Signed-off-by: Manoj Iyer <manoj.iyer@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
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Tim Gardner - May 22, 2012, 5:09 p.m.

Manoj Iyer - May 22, 2012, 6:18 p.m.
On Tue, 22 May 2012, Tim Gardner wrote:

> I am assuming this SRU is for Precise ?

Yes it is for precise, I had a cover letter attached to this patch, with 
pull request, sru justification etc ... not sure if that one got through 
to the mailing list.

>
> -- 
> Tim Gardner tim.gardner@canonical.com
>
>

--
====================
Manoj Iyer
Ubuntu/Canonical
Hardware Enablement
====================
Tim Gardner - May 22, 2012, 6:22 p.m.
On 05/22/2012 12:18 PM, Manoj Iyer wrote:
> 
> 
> On Tue, 22 May 2012, Tim Gardner wrote:
> 
>> I am assuming this SRU is for Precise ?
> 
> Yes it is for precise, I had a cover letter attached to this patch, with
> pull request, sru justification etc ... not sure if that one got through
> to the mailing list.
> 

I just missed it initially 'cause it wasn't on the same thread as the
patch. Thunderbird sometimes helpfully reorders my emails.

Patch

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;