projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| a215792c GKH |
1 | From 4f5f64cf0cc916220aaa055992e31195470cfe37 Mon Sep 17 00:00:00 2001 |
| 2 | From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> | |
| 3 | Date: Fri, 4 Jan 2013 23:00:54 +0100 | |
| 4 | Subject: ACPI / scan: Do not use dummy HID for system bus ACPI nodes | |
| 5 | ||
| 6 | From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> | |
| 7 | ||
| 8 | commit 4f5f64cf0cc916220aaa055992e31195470cfe37 upstream. | |
| 9 | ||
| 10 | At one point acpi_device_set_id() checks if acpi_device_hid(device) | |
| 11 | returns NULL, but that never happens, so system bus devices with an | |
| 12 | empty list of PNP IDs are given the dummy HID ("device") instead of | |
| 13 | the "system bus HID" ("LNXSYBUS"). Fix the code to use the right | |
| 14 | check. | |
| 15 | ||
| 16 | Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> | |
| 17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 18 | ||
| 19 | --- | |
| 20 | drivers/acpi/scan.c | 2 +- | |
| 21 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 22 | ||
| 23 | --- a/drivers/acpi/scan.c | |
| 24 | +++ b/drivers/acpi/scan.c | |
| 25 | @@ -1157,7 +1157,7 @@ static void acpi_device_set_id(struct ac | |
| 26 | acpi_add_id(device, ACPI_DOCK_HID); | |
| 27 | else if (!acpi_ibm_smbus_match(device)) | |
| 28 | acpi_add_id(device, ACPI_SMBUS_IBM_HID); | |
| 29 | - else if (!acpi_device_hid(device) && | |
| 30 | + else if (list_empty(&device->pnp.ids) && | |
| 31 | ACPI_IS_ROOT_DEVICE(device->parent)) { | |
| 32 | acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */ | |
| 33 | strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME); |