Commit 550e7fd8 authored Aug 01, 2009 by Henrique de Moraes Holschuh Committed by Len Brown Aug 01, 2009

thinkpad-acpi: disable broken bay and dock subdrivers



Currently, the ThinkPad-ACPI bay and dock drivers are completely
broken, and cause a NULL pointer derreference in kernel mode (and,
therefore, an OOPS) when they try to issue events (i.e. on dock,
undock, bay ejection, etc).

OTOH, the standard ACPI dock driver can handle the hotplug bays and
docks of the ThinkPads just fine (including batteries) as of 2.6.27.
In fact, it does a much better job of it than thinkpad-acpi ever did.

It is just not worth the hassle to find a way to fix this crap without
breaking the (deprecated) thinkpad-acpi dock/bay ABI.  This is old,
deprecated code that sees little testing or use.

As a quick fix suitable for -stable backports, mark the thinkpad-acpi
bay and dock subdrivers as BROKEN in Kconfig.  The dead code will be
removed by a later patch.

This fixes bugzilla #13669, and should be applied to 2.6.27 and later.

Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Reported-by: Joerg Platte <jplatte@naasa.net>
Cc: stable@kernel.org
Signed-off-by: Len Brown <len.brown@intel.com>

parent ed680c4a

drivers/platform/x86/Kconfig

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -281,6 +281,7 @@ config THINKPAD_ACPI_DOCK
	bool "Legacy Docking Station Support"		bool "Legacy Docking Station Support"
	depends on THINKPAD_ACPI		depends on THINKPAD_ACPI
	depends on ACPI_DOCK=n		depends on ACPI_DOCK=n
			depends on BROKEN
	default n		default n
	---help---		---help---
	Allows the thinkpad_acpi driver to handle docking station events.		Allows the thinkpad_acpi driver to handle docking station events.
	@@ -294,7 +295,8 @@ config THINKPAD_ACPI_DOCK
	config THINKPAD_ACPI_BAY		config THINKPAD_ACPI_BAY
	bool "Legacy Removable Bay Support"		bool "Legacy Removable Bay Support"
	depends on THINKPAD_ACPI		depends on THINKPAD_ACPI
	default y		depends on BROKEN
			default n
	---help---		---help---
	Allows the thinkpad_acpi driver to handle removable bays. It will		Allows the thinkpad_acpi driver to handle removable bays. It will
	electrically disable the device in the bay, and also generate		electrically disable the device in the bay, and also generate