Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751642AbbEDOIL (ORCPT ); Mon, 4 May 2015 10:08:11 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:52042 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751455AbbEDOIC (ORCPT ); Mon, 4 May 2015 10:08:02 -0400 From: "Rafael J. Wysocki" To: Witold Szczeponik Cc: lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ACPI/PNP: add two IDs to list for PNPACPI device enumeration Date: Mon, 04 May 2015 16:33:01 +0200 Message-ID: <1715926.NqNih49uH4@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/4.0.0+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1430499920-28599-1-git-send-email-Witold.Szczeponik@gmx.net> References: <1430499920-28599-1-git-send-email-Witold.Szczeponik@gmx.net> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2078 Lines: 54 On Friday, May 01, 2015 07:05:20 PM Witold Szczeponik wrote: > Commit eec15edbb0e14485998635ea7c62e30911b465f0 ("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. > > The patch is applied against Linux 4.0.x. Queued up as a fix for 4.1, thanks! But your e-mail client mangles whitespace. > NB: A quick way to see if existing devices are missing from the > PNP bus, the following script can be used to list candidates IDs. > > hids="/sys/bus/acpi/devices/*/hid" > for hid in $(grep -v -h -E -e "^(LNX|PNP|ACPI)" $hids | sort -u) > do > grep -q \"$hid\" drivers/acpi/acpi_pnp.c || echo $hid > done > > Signed-off-by: Witold Szczeponik > > > diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c > index b193f84..ff6d8ad 100644 > --- a/drivers/acpi/acpi_pnp.c > +++ b/drivers/acpi/acpi_pnp.c > @@ -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 */ > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/