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

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

PNPACPI: Fix acpi_bus_get_device() check in drivers/pnp/pnpacpi/core.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 35de87de

drivers/pnp/pnpacpi/core.c

+5 −5
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static int pnpacpi_set_resources(struct pnp_dev *dev) 
	pnp_dbg(&dev->dev, "set resources\n");



	handle = DEVICE_ACPI_HANDLE(&dev->dev);

	if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {

	if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		return -ENODEV;

	}
@@ -123,7 +123,7 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev) 
	dev_dbg(&dev->dev, "disable resources\n");



	handle = DEVICE_ACPI_HANDLE(&dev->dev);

	if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {

	if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		return 0;

	}
@@ -145,7 +145,7 @@ static bool pnpacpi_can_wakeup(struct pnp_dev *dev) 
	acpi_handle handle;



	handle = DEVICE_ACPI_HANDLE(&dev->dev);

	if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {

	if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		return false;

	}
@@ -160,7 +160,7 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state) 
	int error = 0;



	handle = DEVICE_ACPI_HANDLE(&dev->dev);

	if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {

	if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		return 0;

	}
@@ -197,7 +197,7 @@ static int pnpacpi_resume(struct pnp_dev *dev) 
	acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);

	int error = 0;



	if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {

	if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		return -ENODEV;

	}