From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 31 Jan 2013 19:54:05 +0000 (+0100)
Subject: ACPI / scan: Fix acpi_bus_get_device() check in acpi_match_device()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0613e1f7fd98a0cef2a7add1368a87cdd86a1106;p=deliverable%2Flinux.git

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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 43754655c156..a4224727f09c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -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);