diff options
| author | Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> | 2013-01-31 03:22:14 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-31 21:03:46 +0100 |
| commit | dde3bb4159dfd872a755922b6a22e005e78389b6 (patch) | |
| tree | e40bf4c7fd0a8c161aec19bc04c2490fd2a7445a /drivers/acpi/device_pm.c | |
| parent | 65ab96f60621c4da8f1b4087a57b788bc4d8f27b (diff) | |
| download | op-kernel-dev-dde3bb4159dfd872a755922b6a22e005e78389b6.zip op-kernel-dev-dde3bb4159dfd872a755922b6a22e005e78389b6.tar.gz | |
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/acpi/device_pm.c')
| -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 4cbc950..3ef075b 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) acpi_handle handle = DEVICE_ACPI_HANDLE(dev); struct acpi_device *adev; - if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) { + if (!handle || acpi_bus_get_device(handle, &adev)) { dev_dbg(dev, "ACPI handle without context in %s!\n", __func__); return -ENODEV; } @@ -574,7 +574,7 @@ int acpi_pm_device_run_wake(struct device *phys_dev, bool enable) return -EINVAL; handle = DEVICE_ACPI_HANDLE(phys_dev); - if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) { + if (!handle || acpi_bus_get_device(handle, &adev)) { dev_dbg(phys_dev, "ACPI handle without context in %s!\n", __func__); return -ENODEV; @@ -618,7 +618,7 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable) return -EINVAL; handle = DEVICE_ACPI_HANDLE(dev); - if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) { + if (!handle || acpi_bus_get_device(handle, &adev)) { dev_dbg(dev, "ACPI handle without context in %s!\n", __func__); return -ENODEV; } |
