From mboxrd@z Thu Jan 1 00:00:00 1970 From: Len Brown Subject: Re: [PATCH] thinkpad-acpi: fix module autoloading for older models Date: Sun, 15 Mar 2009 22:45:20 -0400 (EDT) Message-ID: References: <1234704351-24093-1-git-send-email-hmh@hmh.eng.br> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: Received: from vms173001pub.verizon.net ([206.46.173.1]:60271 "EHLO vms173001pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752027AbZCPCp2 (ORCPT ); Sun, 15 Mar 2009 22:45:28 -0400 Received: from localhost.localdomain ([96.237.168.40]) by vms173001.mailsrvcs.net (Sun Java(tm) System Messaging Server 6.3-7.04 (built Sep 26 2008; 32bit)) with ESMTPA id <0KGK000LPVNLLIB8@vms173001.mailsrvcs.net> for linux-acpi@vger.kernel.org; Sun, 15 Mar 2009 21:45:22 -0500 (CDT) In-reply-to: <1234704351-24093-1-git-send-email-hmh@hmh.eng.br> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Henrique de Moraes Holschuh Cc: ibm-acpi-devel@lists.sourceforge.net, linux-acpi@vger.kernel.org, Mathieu Chouquet-Stringer , stable@kernel.org applied thanks, Len Brown, Intel Open Source Technology Center On Sun, 15 Feb 2009, Henrique de Moraes Holschuh wrote: > From: Mathieu Chouquet-Stringer > > Looking at the source, there seems to be a missing * to match my DMI > string. I mean for newer IBM and Lenovo's laptops you match either one > of the following: > MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*"); > MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*"); > > While for older Thinkpads, you do this (for instance): > IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]"); > > with IBM_BIOS_MODULE_ALIAS being MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW") > > Note there's no * terminating the string. As result, udev doesn't load > anything because modprobe cannot find anything matching this (my > machine actually): > > udevtest: run: '/sbin/modprobe dmi:bvnIBM:bvr1IET71WW(2.10):bd06/16/2006:svnIBM:pn236621U:pvrNotAvailable:rvnIBM:rn236621U:rvrNotAvailable:cvnIBM:ct10:cvrNotAvailable:' > > Signed-off-by: Mathieu Chouquet-Stringer > Acked-by: Henrique de Moraes Holschuh > Cc: stable@kernel.org > --- > drivers/platform/x86/thinkpad_acpi.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > > Len, please consider this for 2.6.29. It is an obvious one-liner. > > diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c > index 91ae159..d218ecb 100644 > --- a/drivers/platform/x86/thinkpad_acpi.c > +++ b/drivers/platform/x86/thinkpad_acpi.c > @@ -7524,7 +7524,7 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME); > * if it is not there yet. > */ > #define IBM_BIOS_MODULE_ALIAS(__type) \ > - MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW") > + MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*") > > /* Non-ancient thinkpads */ > MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*"); > -- > 1.5.6.5 >