diff options
author | Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> | 2013-01-30 22:22:14 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-31 15:03:46 -0500 |
commit | dde3bb4159dfd872a755922b6a22e005e78389b6 (patch) | |
tree | e40bf4c7fd0a8c161aec19bc04c2490fd2a7445a /drivers | |
parent | 65ab96f60621c4da8f1b4087a57b788bc4d8f27b (diff) |
ACPI / PM: Fix acpi_bus_get_device() check in drivers/acpi/device_pm.c
acpi_bus_get_device() returns int not acpi_status.
The patch change not to apply ACPI_FAILURE() to the return value of
acpi_bus_get_device().
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/device_pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 4cbc9505b365..3ef075b71870 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c | |||
@@ -497,7 +497,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p, int d_max_in) | |||
497 | acpi_handle handle = DEVICE_ACPI_HANDLE(dev); | 497 | acpi_handle handle = DEVICE_ACPI_HANDLE(dev); |
498 | struct acpi_device *adev; | 498 | struct acpi_device *adev; |
499 | 499 | ||
500 | if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) { | 500 | if (!handle || acpi_bus_get_device(handle, &adev)) { |
501 | dev_dbg(dev, "ACPI handle without context in %s!\n", __func__); | 501 | dev_dbg(dev, "ACPI handle without context in %s!\n", __func__); |
502 | return -ENODEV; | 502 | return -ENODEV; |
503 | } | 503 | } |
@@ -574,7 +574,7 @@ int acpi_pm_device_run_wake(struct device *phys_dev, bool enable) | |||
574 | return -EINVAL; | 574 | return -EINVAL; |
575 | 575 | ||
576 | handle = DEVICE_ACPI_HANDLE(phys_dev); | 576 | handle = DEVICE_ACPI_HANDLE(phys_dev); |
577 | if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) { | 577 | if (!handle || acpi_bus_get_device(handle, &adev)) { |
578 | dev_dbg(phys_dev, "ACPI handle without context in %s!\n", | 578 | dev_dbg(phys_dev, "ACPI handle without context in %s!\n", |
579 | __func__); | 579 | __func__); |
580 | return -ENODEV; | 580 | return -ENODEV; |
@@ -618,7 +618,7 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable) | |||
618 | return -EINVAL; | 618 | return -EINVAL; |
619 | 619 | ||
620 | handle = DEVICE_ACPI_HANDLE(dev); | 620 | handle = DEVICE_ACPI_HANDLE(dev); |
621 | if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) { | 621 | if (!handle || acpi_bus_get_device(handle, &adev)) { |
622 | dev_dbg(dev, "ACPI handle without context in %s!\n", __func__); | 622 | dev_dbg(dev, "ACPI handle without context in %s!\n", __func__); |
623 | return -ENODEV; | 623 | return -ENODEV; |
624 | } | 624 | } |