Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dde3bb41 authored by Yasuaki Ishimatsu's avatar Yasuaki Ishimatsu Committed by Rafael J. Wysocki
Browse files

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: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 65ab96f6

drivers/acpi/device_pm.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}