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)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 4 May 2015 14:03:12 +0000 (16:03 +0200)
commit622532bb2fad8fe342fb685727ae0be566f6be5d
tree4118d8e0c5a8ae94c3eb095f5d6a90f04606a5ac
parent5ebe6afaf0057ac3eaeb98defd5456894b446d22
ACPI / PNP: add two IDs to list for PNPACPI device enumeration

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>
Cc: 3.16+ <stable@vger.kernel.org> # 3.16+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/acpi_pnp.c