| From 622532bb2fad8fe342fb685727ae0be566f6be5d Mon Sep 17 00:00:00 2001 |
| From: Witold Szczeponik <Witold.Szczeponik@gmx.net> |
| Date: Fri, 1 May 2015 19:05:20 +0200 |
| Subject: ACPI / PNP: add two IDs to list for PNPACPI device enumeration |
| |
| From: Witold Szczeponik <Witold.Szczeponik@gmx.net> |
| |
| 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 | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/acpi/acpi_pnp.c |
| +++ b/drivers/acpi/acpi_pnp.c |
| @@ -304,6 +304,8 @@ static const struct acpi_device_id acpi_ |
| {"PNPb006"}, |
| /* cs423x-pnpbios */ |
| {"CSC0100"}, |
| + {"CSC0103"}, |
| + {"CSC0110"}, |
| {"CSC0000"}, |
| {"GIM0100"}, /* Guillemot Turtlebeach something appears to be cs4232 compatible */ |
| /* es18xx-pnpbios */ |
