Commit c128c776 authored Jul 09, 2014 by Zhang Rui Committed by Rafael J. Wysocki Jul 09, 2014

ACPI / PNP: add soc_button_array device ID to PNP IDs list



The soc_button_array PNP driver was introduced in 3.15.
But in commit eec15edb (ACPI / PNP: use device ID list for
PNPACPI device enumeration), when reworking the PNPACPI device
enumeration, we missed the soc_button_array device ID.

This results in a regression in 3.16-rc1 that soc_button_array
pnp device fails to be enumerated.

Fix the problem by adding soc_button_array device ID into the
acpi_pnp scan handler's ID list.

Fixes: eec15edb (ACPI / PNP: use device ID list for PNPACPI device enumeration)
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent cd3de83f

drivers/acpi/acpi_pnp.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,8 @@
		#include <linux/module.h>

		static const struct acpi_device_id acpi_pnp_device_ids[] = {
		/* soc_button_array */
		{"PNP0C40"},
		/* pata_isapnp */
		{"PNP0600"}, /* Generic ESDI/IDE/ATA compatible hard disk controller */
		/* floppy */