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

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 <>
Acked-by: default avatarYasuaki Ishimatsu <>
Acked-by: default avatarYinghai Lu <>
Reviewed-by: default avatarMika Westerberg <>
parent c511cc19
......@@ -444,9 +444,9 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
const struct device *dev)
struct acpi_device *adev;
acpi_handle handle = ACPI_HANDLE(dev);
if (!ids || !ACPI_HANDLE(dev)
|| ACPI_FAILURE(acpi_bus_get_device(ACPI_HANDLE(dev), &adev)))
if (!ids || !handle || acpi_bus_get_device(handle, &adev))
return NULL;
return __acpi_match_device(adev, ids);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment