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

Commit 0613e1f7 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI / scan: Fix acpi_bus_get_device() check in acpi_match_device() 



Since acpi_bus_get_device() returns int and not acpi_status, change
acpi_match_device() so that it doesn't apply ACPI_FAILURE() to the
return value of acpi_bus_get_device().

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent c511cc19

drivers/acpi/scan.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -444,9 +444,9 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, 
					       const struct device *dev)

					       const struct device *dev)

{

{

	struct acpi_device *adev;

	struct acpi_device *adev;

	acpi_handle handle = ACPI_HANDLE(dev);





	if (!ids || !ACPI_HANDLE(dev)

	if (!ids || !handle || acpi_bus_get_device(handle, &adev))

	    || ACPI_FAILURE(acpi_bus_get_device(ACPI_HANDLE(dev), &adev)))

		return NULL;

		return NULL;





	return __acpi_match_device(adev, ids);

	return __acpi_match_device(adev, ids);