From patchwork Sat Mar 14 10:42:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Chouquet-Stringer X-Patchwork-Id: 12099 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2EB5mHR003680 for ; Sat, 14 Mar 2009 11:05:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752421AbZCNLFt (ORCPT ); Sat, 14 Mar 2009 07:05:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752379AbZCNLFs (ORCPT ); Sat, 14 Mar 2009 07:05:48 -0400 Received: from slow2-v.mail.gandi.net ([217.70.178.89]:41368 "EHLO slow2-v.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751396AbZCNLFs (ORCPT ); Sat, 14 Mar 2009 07:05:48 -0400 Received: from relay3-v.mail.gandi.net (relay3-v.mail.gandi.net [217.70.178.77]) by slow2-v.mail.gandi.net (Postfix) with ESMTP id C7CA21BF161 for ; Sat, 14 Mar 2009 11:42:36 +0100 (CET) Received: from mobydick.mine.nu (mobydick.vms.lost-oasis.net [212.85.155.23]) by relay3-v.mail.gandi.net (Postfix) with ESMTP id 04561BA19; Sat, 14 Mar 2009 11:42:06 +0100 (CET) Received: from mobydick.mine.nu (mobydick.mine.nu [127.0.0.1]) by mobydick.mine.nu (8.13.8/8.13.8) with ESMTP id n2EAg5eK011264; Sat, 14 Mar 2009 11:42:05 +0100 Received: (from mchouque@localhost) by mobydick.mine.nu (8.13.8/8.13.8/Submit) id n2EAg4v9011263; Sat, 14 Mar 2009 11:42:04 +0100 Date: Sat, 14 Mar 2009 11:42:04 +0100 From: Mathieu Chouquet-Stringer To: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org Cc: Len Brown , ibm-acpi-devel@lists.sourceforge.net, linux-acpi@vger.kernel.org, stable@kernel.org, Henrique de Moraes Holschuh Subject: [PATCH] thinkpad-acpi: fix module autoloading for older models Message-ID: <20090314104204.GA11226@mobydick> Mail-Followup-To: Mathieu Chouquet-Stringer , linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, Len Brown , ibm-acpi-devel@lists.sourceforge.net, linux-acpi@vger.kernel.org, stable@kernel.org, Henrique de Moraes Holschuh MIME-Version: 1.0 Content-Disposition: inline X-Face: %JOeya=Dg!}[/#Go&*&cQ+)){p1c8}u\Fg2Q3&)kothIq|JnWoVzJtCFo~4X X-Mailing-List: linux-acpi@vger.kernel.org Hello Linus, Looks like this one liner patch never made it... Hopefully, it'll go in before you release rc9 or 2.6.29. Best, Mathieu ----- Forwarded message from Henrique de Moraes Holschuh ----- Delivered-To: online.fr-mchouque@free.fr X-Sasl-enc: J0pR0vt90JACc2icrP/7acPg7Vn8fC4jw2hSyELrb8PJ 1234704353 X-Virus-Scanned: Debian amavisd-new at khazad-dum.debian.net From: Henrique de Moraes Holschuh To: Len Brown Cc: ibm-acpi-devel@lists.sourceforge.net, linux-acpi@vger.kernel.org, Mathieu Chouquet-Stringer , stable@kernel.org Subject: [PATCH] thinkpad-acpi: fix module autoloading for older models Date: Sun, 15 Feb 2009 10:25:51 -0300 X-Mailer: git-send-email 1.5.6.5 X-CRM114-Version: 20070301-BlameBaltar ( TRE 0.7.5 (LGPL) ) MF-F8A122EB [pR: -2.3502] X-CRM114-CacheID: sfid-20090215_142656_606015_D7CAAB9F X-CRM114-Status: UNSURE (-2.3502) This message is 'unsure'; please train it! 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:*");