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/device_pm.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/device_pm.c')
| -rw-r--r-- | drivers/acpi/device_pm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index f09dc987cf17..c6ff606c6d5b 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c | |||
| @@ -358,8 +358,7 @@ static struct acpi_device *acpi_dev_pm_get_node(struct device *dev) | |||
| 358 | acpi_handle handle = DEVICE_ACPI_HANDLE(dev); | 358 | acpi_handle handle = DEVICE_ACPI_HANDLE(dev); |
| 359 | struct acpi_device *adev; | 359 | struct acpi_device *adev; |
| 360 | 360 | ||
| 361 | return handle && ACPI_SUCCESS(acpi_bus_get_device(handle, &adev)) ? | 361 | return handle && !acpi_bus_get_device(handle, &adev) ? adev : NULL; |
| 362 | adev : NULL; | ||
| 363 | } | 362 | } |
| 364 | 363 | ||
| 365 | /** | 364 | /** |