]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
ACPI / PM: Fix acpi_bus_get_device() check in drivers/acpi/device_pm.c
authorYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Thu, 31 Jan 2013 03:22:14 +0000 (03:22 +0000)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 31 Jan 2013 20:03:46 +0000 (21:03 +0100)
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>
drivers/acpi/device_pm.c

index 4cbc9505b365c354f230f0fe844bf259d8eb4484..3ef075b718703632481bf88c81377811bef0d340 100644 (file)
@@ -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;
        }