Commit 622532bb authored May 01, 2015 by Witold Szczeponik Committed by Rafael J. Wysocki May 04, 2015

ACPI / PNP: add two IDs to list for PNPACPI device enumeration



Commit eec15edb (ACPI / PNP: use device ID list for PNPACPI device
enumeration) changed the way how ACPI devices are enumerated and when
they are added to the PNP bus.

However, it broke the sound card support on (at least) a vintage
IBM ThinkPad 600E: with said commit applied, two of the necessary
"CSC01xx" devices are not added to the PNP bus and hence can not be
found during the initialization of the "snd-cs4236" module.  As a
consequence, loading "snd-cs4236" causes null pointer exceptions.
The attached patch fixes the problem end re-enables sound on the
IBM ThinkPad 600E.

Fixes: eec15edb (ACPI / PNP: use device ID list for PNPACPI device enumeration)
Signed-off-by: Witold Szczeponik <Witold.Szczeponik@gmx.net>
Cc: 3.16+ <stable@vger.kernel.org> # 3.16+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 5ebe6afa

drivers/acpi/acpi_pnp.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -304,6 +304,8 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {
		{"PNPb006"},
		/* cs423x-pnpbios */
		{"CSC0100"},
		{"CSC0103"},
		{"CSC0110"},
		{"CSC0000"},
		{"GIM0100"}, /* Guillemot Turtlebeach something appears to be cs4232 compatible */
		/* es18xx-pnpbios */

Admin message