| From 4f5f64cf0cc916220aaa055992e31195470cfe37 Mon Sep 17 00:00:00 2001 |
| From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> |
| Date: Fri, 4 Jan 2013 23:00:54 +0100 |
| Subject: ACPI / scan: Do not use dummy HID for system bus ACPI nodes |
| |
| From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> |
| |
| commit 4f5f64cf0cc916220aaa055992e31195470cfe37 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/acpi/scan.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/acpi/scan.c |
| +++ b/drivers/acpi/scan.c |
| @@ -1227,7 +1227,7 @@ static void acpi_device_set_id(struct ac |
| 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); |