diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-04 17:10:29 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-04 17:10:29 -0500 |
| commit | f3fe8bd7b114d88c802616a98a0cf69299c37ed3 (patch) | |
| tree | ae98aa0acb783c5f8e57bd29ca8ede44d569b444 /drivers/acpi/scan.c | |
| parent | c49d874bafd0a63379294ebd3531c41f9fcebc7d (diff) | |
| parent | 4f5f64cf0cc916220aaa055992e31195470cfe37 (diff) | |
Merge branch 'acpi-assorted'
* acpi-assorted:
ACPI / scan: Do not use dummy HID for system bus ACPI nodes
ACPI / power: Remove useless message from device registering routine
ACPI / glue: Update DBG macro to include KERN_DEBUG
ACPI / PM: Do not apply ACPI_SUCCESS() to acpi_bus_get_device() result
ACPI / memhotplug: remove redundant logic of acpi memory hotadd
ACPI / APEI: Fix the returned value in erst_dbg_read
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 53502d1bbf26..c88be6c37c30 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -1346,7 +1346,7 @@ static void acpi_device_set_id(struct acpi_device *device) | |||
| 1346 | acpi_add_id(device, ACPI_DOCK_HID); | 1346 | acpi_add_id(device, ACPI_DOCK_HID); |
| 1347 | else if (!acpi_ibm_smbus_match(device)) | 1347 | else if (!acpi_ibm_smbus_match(device)) |
| 1348 | acpi_add_id(device, ACPI_SMBUS_IBM_HID); | 1348 | acpi_add_id(device, ACPI_SMBUS_IBM_HID); |
| 1349 | else if (!acpi_device_hid(device) && | 1349 | else if (list_empty(&device->pnp.ids) && |
| 1350 | ACPI_IS_ROOT_DEVICE(device->parent)) { | 1350 | ACPI_IS_ROOT_DEVICE(device->parent)) { |
| 1351 | acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */ | 1351 | acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */ |
| 1352 | strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME); | 1352 | strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME); |