Commit 292d7355 authored Jul 04, 2008 by maximilian attems Committed by Linus Torvalds Jul 04, 2008

hdaps: add support for various newer Lenovo thinkpads

Adds R61, T61p, X61s, X61, Z61m, Z61p models to whitelist.

Fixes this:

cullen@lenny:~$ sudo modprobe hdaps
FATAL: Error inserting hdaps (/lib/modules/2.6.22-10-generic/kernel/drivers/hwmon/hdaps.ko): No such device

[25192.888000] hdaps: supported laptop not found!
[25192.888000] hdaps: driver init failed (ret=-19)!

Originally based on an Ubuntu patch that got it wrong, the dmidecode
output of the corresponding laptops shows LENOVO as the manufacturer.
https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.22/+bug/133636



tested on X61s:
[  184.893588] hdaps: inverting axis readings.
[  184.893588] hdaps: LENOVO ThinkPad X61s detected.
[  184.893588] input: hdaps as /class/input/input12
[  184.924326] hdaps: driver successfully loaded.

Cc: Klaus S. Madsen <ubuntu@hjernemadsen.org>
Cc: Chuck Short <zulcss@ubuntu.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: maximilian attems <max@stro.at>
Cc: Mark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 71f77055

drivers/hwmon/hdaps.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -516,17 +516,23 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
		HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
		HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
		HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"),
		HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61"),
		HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
		HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
		HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p"),
		HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T42"),
		HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"),
		HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"),
		HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61p"),
		HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"),
		HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X40"),
		HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X41"),
		HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60"),
		HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61s"),
		HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61"),
		HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad Z60m"),
		HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61m"),
		HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61p"),
		{ .ident = NULL }
		};

Admin message