releases/upstream/2.6.29-rc8/0002-thinkpad-acpi-fix-module-autoloading-for-older-mode.patch

   1 From b36a50f92d1c4300a88f606b4d2bbdc4f442a2d7 Mon Sep 17 00:00:00 2001
   2 From: Mathieu Chouquet-Stringer <mchouque@free.fr>
   3 Date: Sat, 14 Mar 2009 16:35:26 +0100
   4 Subject: thinkpad-acpi: fix module autoloading for older models
   5
   6 Looking at the source, there seems to be a missing * to match my DMI
   7 string.  I mean for newer IBM and Lenovo's laptops you match either one
   8 of the following:
   9 MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*");
  10 MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");
  11
  12 While for older Thinkpads, you do this (for instance):
  13 IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]");
  14
  15 with IBM_BIOS_MODULE_ALIAS being MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW")
  16
  17 Note there's no * terminating the string.  As result, udev doesn't load
  18 anything because modprobe cannot find anything matching this (my
  19 machine actually):
  20
  21 udevtest: run: '/sbin/modprobe dmi:bvnIBM:bvr1IET71WW(2.10):bd06/16/2006:svnIBM:pn236621U:pvrNotAv
  22
  23 Signed-off-by: Mathieu Chouquet-Stringer <mchouque@free.fr>
  24 Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  25 Signed-off-by: Len Brown <len.brown@intel.com>
  26 ---
  27  drivers/platform/x86/thinkpad_acpi.c |    8 ++++----
  28  1 files changed, 4 insertions(+), 4 deletions(-)
  29
  30 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
  31 index bcbc051..d243320 100644
  32 --- a/drivers/platform/x86/thinkpad_acpi.c
  33 +++ b/drivers/platform/x86/thinkpad_acpi.c
  34 @@ -7532,7 +7532,7 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME);
  35   * if it is not there yet.
  36   */
  37  #define IBM_BIOS_MODULE_ALIAS(__type) \
  38 -       MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW")
  39 +       MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*")
  40
  41  /* Non-ancient thinkpads */
  42  MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*");
  43 @@ -7541,9 +7541,9 @@ MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");
  44  /* Ancient thinkpad BIOSes have to be identified by
  45   * BIOS type or model number, and there are far less
  46   * BIOS types than model numbers... */
  47 -IBM_BIOS_MODULE_ALIAS("I[B,D,H,I,M,N,O,T,W,V,Y,Z]");
  48 -IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]");
  49 -IBM_BIOS_MODULE_ALIAS("K[U,X-Z]");
  50 +IBM_BIOS_MODULE_ALIAS("I[BDHIMNOTWVYZ]");
  51 +IBM_BIOS_MODULE_ALIAS("1[0368A-GIKM-PST]");
  52 +IBM_BIOS_MODULE_ALIAS("K[UX-Z]");
  53
  54  MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh");
  55  MODULE_DESCRIPTION(TPACPI_DESC);
  56 --
  57 1.6.2
  58