]> git.hungrycats.org Git - linux/commit
ACPI / PNP: add two IDs to list for PNPACPI device enumeration
authorWitold Szczeponik <Witold.Szczeponik@gmx.net>
Fri, 1 May 2015 17:05:20 +0000 (19:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 May 2015 16:55:06 +0000 (09:55 -0700)
commit9c998de5e629ceeaf23b16997494de074f2ef2a0
tree676f281e536ca2fb9ed52191bf5c86d10c259532
parent317e6bf62361e884e57f915e15a9735e08fe7b3a
ACPI / PNP: add two IDs to list for PNPACPI device enumeration

commit 622532bb2fad8fe342fb685727ae0be566f6be5d upstream.

Commit eec15edbb0e1 (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: eec15edbb0e1 (ACPI / PNP: use device ID list for PNPACPI device enumeration)
Signed-off-by: Witold Szczeponik <Witold.Szczeponik@gmx.net>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/acpi/acpi_pnp.c