Commit 4f5f64cf authored Jan 04, 2013 by Rafael J. Wysocki

ACPI / scan: Do not use dummy HID for system bus ACPI nodes



At one point acpi_device_set_id() checks if acpi_device_hid(device)
returns NULL, but that never happens, so system bus devices with an
empty list of PNP IDs are given the dummy HID ("device") instead of
the "system bus HID" ("LNXSYBUS").  Fix the code to use the right
check.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: <stable@vger.kernel.org>

parent 0271f4f1

drivers/acpi/scan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1346,7 +1346,7 @@ static void acpi_device_set_id(struct acpi_device *device)
		acpi_add_id(device, ACPI_DOCK_HID);
		else if (!acpi_ibm_smbus_match(device))
		acpi_add_id(device, ACPI_SMBUS_IBM_HID);
		else if (!acpi_device_hid(device) &&
		else if (list_empty(&device->pnp.ids) &&
		ACPI_IS_ROOT_DEVICE(device->parent)) {
		acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */
		strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);

Admin message